Revision 03391ae0b5d60cd1d018635fb8438c9da21bc55c

Committed on 20/02/2017 11:29 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.8