Update dependencies.
Merge branch 'master' into cucumber_to_midje