Revision 774b853f7ea7367b2afca9122b2a248f0ad12c12

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

Merge branch '1.13'