Revision e08b4f5a4dab1890ebfeb146ccb67ccf79384a7c

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

Merge branch '1.0' into 1.1