Merge branch 'master' into issue-1262
authorKim Kulling <kim.kulling@slm-solutions.com>
Wed, 17 May 2017 08:20:45 +0000 (10:20 +0200)
committerKim Kulling <kim.kulling@slm-solutions.com>
Wed, 17 May 2017 08:20:45 +0000 (10:20 +0200)

Trivial merge