Merge pull request #803 from rustyswayne/1.4.0

Fixes issue with Examine Management Console