Merge pull request #112 from mchf/master

Ported patch from Code-11-SP3
Merge remote-tracking branch 'upstream/master'