Re-done some (most?) of the changes from the abandoned branch ‘calabash-1.1’, as development of Calabash 1.1 has been stopped. So I went through all commits in that branch and merged them manually back to master.