Revision 693e4a4e6b6b854abcc709714b133f2a280093b8

Committed on 17/09/2018 1:39 am by Mateusz Bieniek <mateusz.bieniek@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.13