Revision ba0ec7c8471d9944cf84660abe880ea08905bce8

Committed on 03/04/2018 4:14 am by konradoboza <konrad.oboza@ez.no> [GitHub Diff]

Merge remote-tracking branch 'upstream/1.13'