Revision 3d85b6fb3598211375b873e04f7d28f8fe61775a

Committed on 09/10/2018 5:56 am by Dawid ParafiƄski <dawid.parafinski@ez.no> [GitHub Diff]

Merge remote-tracking branch 'upstream/7.2'