Revision ac12b57e00be32b3bd0683293a8590f96fba7c84

Committed on 07/03/2017 4:38 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.2'