Revision dbfc160165a21d1ac8a8f2b48442958e17874f8a

Committed on 12/09/2018 4:04 am by Kamil Madejski <kamil.madejski@ez.no> [GitHub Diff]

Merge branch '2.2'