Fix cucumber specs/features (sorry about that)
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into remove_cleditor