Merge branch 'master' into mirio/implosion
authorMirio <opivy@hotmail.de>
Tue, 18 Nov 2014 15:50:58 +0000 (16:50 +0100)
committerMirio <opivy@hotmail.de>
Tue, 18 Nov 2014 15:50:58 +0000 (16:50 +0100)

Trivial merge