Revision 82721cc77a14f00ffbbc600193afe3d8ef04c231

Committed on 16/03/2017 1:32 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.1' into 1.2