Revision 1613ddf8fc6aad8db3a6f53aa3b7a3e98ece9bcc

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

Merge branch '1.8'