Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 15 May 2015 15:28:48 +0000 (17:28 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 15 May 2015 15:28:48 +0000 (17:28 +0200)

Trivial merge