Revive bugfix.
Merge pull request #3176 from Segrain/master

Rejuvenate bugfix.
Merge branch 'master' of https://github.com/Baystation12/Baystation12