Merge branch 'master' into amade/finalrage
authorMirio <opivy@hotmail.de>
Thu, 9 Jul 2015 19:06:40 +0000 (21:06 +0200)
committerMirio <opivy@hotmail.de>
Thu, 9 Jul 2015 19:06:40 +0000 (21:06 +0200)

Trivial merge