Revision 53d439080b973dae969fa4be6cfcbe90ac3585a3

Committed on 16/05/2018 2:29 am by Adam Wójs <adam.wojs@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.13