Revision fc3ff6eaa80865f2950c42075e0a5e1cb644a19c

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

Merge branch '1.7' into 1.8