Merge commit 'cab6cdf7'
authorKim Kulling <kim.kulling@slm-solutions.com>
Thu, 1 Jun 2017 14:22:14 +0000 (16:22 +0200)
committerKim Kulling <kim.kulling@slm-solutions.com>
Thu, 1 Jun 2017 14:22:14 +0000 (16:22 +0200)

Trivial merge