Revision fba1a75ff5d2d3eb6342f84e3de18a10784853fc

Committed on 16/04/2018 3:01 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.13'