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


Trivial merge