Revision 7117828b337f19105b0b2a5b88d4b9cf84f0723e

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

Merge branch '1.8'