Merge pull request #1005 from GiantRobot/CRM-12804