Revision 603f9500430fb300476c76958d25de0abcee6a88

Committed on 05/07/2018 2:33 am by Kamil Madejski <kamil.madejski@ez.no> [GitHub Diff]

Merge branch '2.0' into 2.1