Bug 874594
Bug 888550
Merge pull request #1235 from danmcp/master

Fixing Bugs