Stolen Bugfixes Redux
Merge pull request #972 from ike709/master

Stolen Bugfixes Redux