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


Trivial merge