Revision f368e89b201383a926791c3458eb32aa70d462a0

Committed on 20/09/2018 3:51 am by Kamil Madejski <kamil.madejski@ez.no> [GitHub Diff]

Merge branch '2.2'