Revision 3c49160bd33501862f26c5e254326869c7e6cc6a

Committed on 15/02/2018 4:52 am by Damian Zabawa <damian.zabawa@ez.no> [GitHub Diff]

Merge branch '1.2' into 2.0