rspec tests are all passed. To be continue
make cucumber tests passing
Merge branch 'upgrade-to-4.1' into 1.6-dev