Cucumber stuff, otra vez.

I have pulled from upstream master and merged the conflicts.