Revision 9954e7e7351694d156b169bb833fa934c87d8fd9

Committed on 30/05/2018 8:19 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.4'