Revision 650da018effa28f604702d22d1ceabf4ec13cd6a

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

Merge branch '2.0' into 2.1