Revision 4f775680d0533317cde0b035237da039ef5a062c

Committed on 04/05/2017 1:53 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.9