Revision 36ed4b9051ecd3130e0fb6727a14914311dfbcf6

Committed on 09/02/2018 1:54 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.5'