Revision 569079a717315ceb91855b078a300d3c383859cd

Committed on 31/01/2018 7:51 am by Damian Zabawa <damian.zabawa@ez.no> [GitHub Diff]

Merge branch 2.0 into 2.1