Revision 0526298e8107b822819ee14822fc5fa24f51bdbd

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

Merge branch '1.7' into 1.13