Fix/333

>I rebased this branch (fix/333) against master, and added tests for #1297 in 7c4ba93.

See visionmedia/mocha#1339