Fix Bug 1003995: High Priority Copy Changes
Merge pull request #178 from bensternthal/1003995-Fire-Copy-Change

Fix Bug 1003995: High Priority Copy Changes
Merge remote-tracking branch 'upstream/master'