Revision 092ca208312fc781131cffa0aca99db7add03bb5

Committed on 14/12/2018 12:03 am by Marek Nocon <marek.nocon@ez.no> [GitHub Diff]

Merge branch '1.11' into 2.2