Revision 34b9fca8af8ab0cdbccd7054b165a19d0009ce10

Committed on 04/06/2017 7:32 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.9