Merge branch 'matthiaskrgr/dance_unstuck'
authorMirio <opivy@hotmail.de>
Fri, 28 Aug 2015 14:51:59 +0000 (16:51 +0200)
committerMirio <opivy@hotmail.de>
Fri, 28 Aug 2015 14:51:59 +0000 (16:51 +0200)

Trivial merge