Revision 8639fc5e8a315ca00fbea97ff05ec3d882732b15

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

Merge branch '1.1' into 1.2