Revision 9f94ef641113edc369a8e7295fb1bd6801fd5dea

Committed on 26/10/2018 2:21 am by Vidar Langseid <[email protected]> [GitHub Diff]

Merge branch '1.7'