Revision ed4c9880743fd63feebb95ea581d3be8cd91389d

Committed on 18/01/2019 4:47 am by Gunnstein Lye <[email protected]> [GitHub Diff]

Merge branch '6.7' into 6.13