Upgrade to mocha 0.13.3 (compatible with Rails 3.2.12)
Adding upgrade_in_progress at the gear level
Merge pull request #2486 from danmcp/master

Merged by openshift-bot
Merge pull request #2424 from smarterclayton/upgrade_to_mocha_0_13_3

Upgrade to mocha 0.13.3 (compatible with Rails 3.2.12)