Merge pull request #189 from HRogge/for-14.07
authorBastian Bittorf <bittorf@bluebottle.com>
Wed, 25 May 2016 08:15:13 +0000 (10:15 +0200)
committerBastian Bittorf <bittorf@bluebottle.com>
Wed, 25 May 2016 08:15:13 +0000 (10:15 +0200)
For 14.07


Trivial merge