Merge pull request #3761 from Segrain/master

Mecha bugfixes.
Smallfix.