Merge branch 'master' into for-15.05
authorSteven Barth <[email protected]>
Mon, 4 May 2015 18:31:17 +0000 (20:31 +0200)
committerSteven Barth <[email protected]>
Mon, 4 May 2015 18:31:17 +0000 (20:31 +0200)

Trivial merge