Revision baec5a6162743c95c38594af092a9f08ef678d75

Committed on 26/02/2018 7:48 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.2' into 2.0