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


Trivial merge