Bugzilla 12623
Merge pull request #557 from Hackerpilot/master

Fix Bugzilla 12623