Merge remote-tracking branch 'ocramius/better-exception-information'