Revision dc60306347cde00dcc3e53896fdc46a7dd04870a

Committed on 18/10/2018 2:38 am by Marek Nocon <marek.nocon@ez.no> [GitHub Diff]

Merge branch '2.3'