Revision 842e43f1ef98150027dde0dd20b0e005882c0e86

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

Merge branch '1.13'