Revision 7431161565e889a9e15ad8bc25a5cd972ab5ac17

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

Merge branch '1.5'