Merge pull request #152 from HRogge/for-12.09.x
authorBastian Bittorf <bittorf@bluebottle.com>
Fri, 4 Mar 2016 14:55:55 +0000 (15:55 +0100)
committerBastian Bittorf <bittorf@bluebottle.com>
Fri, 4 Mar 2016 14:55:55 +0000 (15:55 +0100)
For 12.09.x


Trivial merge