Revision e963031478fd62851ee77f8c525532cb9adc318d

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

Merge branch '2.1' into 2.2