Revision f36bd57d727690e69d964f72b1b65607df345791

Committed on 06/08/2018 5:22 am by Marek Nocon <marek.nocon@ez.no> [GitHub Diff]

Merge branch '1.13' into 2.2