Revision 989b606c43b52a47bd1e41304bc51e8c1258f05d

Committed on 13/12/2018 11:52 pm by Marek Nocon <marek.nocon@ez.no> [GitHub Diff]

Merge branch '2.3'