Revision bbf43326e288d39b276cd9fa4864985d9940483b

Committed on 15/02/2019 4:57 am by Kamil Madejski <kamil.madejski@ez.no> [GitHub Diff]

Merge branch '6.7' into 6.13