Merge pull request #265 from gabri94/for-15.05
authorBastian Bittorf <bb@npl.de>
Fri, 27 Jan 2017 09:26:14 +0000 (10:26 +0100)
committerGitHub <noreply@github.com>
Fri, 27 Jan 2017 09:26:14 +0000 (10:26 +0100)
For 15.05


Trivial merge