Merge branch 'release/release-2-17-2014_1_5_9' into development
Changelog update:
Merge branch 'release/release-2-26-2014_1.6.0'
Merge branch 'master' of github.com:alnutile/behat_editor_saucelabs