Merge branch 'master' into sev/luma
authorSeverin Meyer <sev.ch@web.de>
Fri, 2 Jan 2015 09:47:07 +0000 (10:47 +0100)
committerSeverin Meyer <sev.ch@web.de>
Fri, 2 Jan 2015 09:47:07 +0000 (10:47 +0100)

Trivial merge