Revision 0a49289867c4453de5a8b53be2b440332ce1f8ab

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

Merge branch '1.5'