Revision 31313754a720d36f93ca38e1ed0f965483186f0d

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

Merge branch '1.13' into 2.1