Merge branch 'master' into mirio/implosion
authorMirio <opivy@hotmail.de>
Thu, 27 Nov 2014 00:02:50 +0000 (01:02 +0100)
committerMirio <opivy@hotmail.de>
Thu, 27 Nov 2014 00:02:50 +0000 (01:02 +0100)

Trivial merge