Revision 83480c3b632f381dba6d56e2579191e66ca6dc63

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

Merge branch '1.11' into 2.3