Revision 4336f430ae24bf0bea85349fff86a4ba76e39164

Committed on 28/12/2018 11:21 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.13