Merge branch 'release/release-2-11-2014_1_5_8'
Fix merge issue
Update changelog
Merge branch 'release/release-2-17-2014_1_5_9'
Merge branch 'release/release-2-17-2014_1_5_9' into development
Changelog update:
Update behat_editor_saucelabs.install
Merge branch 'release/release-2-26-2014_1.6.0' into development
Merge branch 'master' of github.com:alnutile/behat_editor_saucelabs into development
Merge branch 'development' of github.com:alnutile/behat_editor_saucelabs into development