Revision cf9100de0a4f914b6eb6a87de06af9758159d0e0

Committed on 02/07/2018 3:55 am by Adam Wójs <adam.wojs@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.13