Revision 3da007fa61401cbbb52951bcade507ade269720c

Committed on 18/06/2018 6:16 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '2.1'