Revision 8718c1180fa35abcb17686d4d6be1d4f7dfba84a

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

Merge branch '1.8'