Revision 6f49227f04311599765e98f6a64637b69481e875

Committed on 17/10/2018 7:59 am by Andrew Longosz <[email protected]> [GitHub Diff]

Merge branch '6.7' into 6.13