Revision 1c893a25a09310c561a071a50b5f93ec6bf03706

Committed on 18/12/2018 7:52 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.13