Revision 02416ff4c7f3262d317cd406f3dba53c33d62e17

Committed on 23/08/2018 2:50 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '2.2'