Revision e2ed5fdf06e9af5f29e225bb722f23ea0ee44a10

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

Merge branch '2.0' into 2.1