Merge branch 'hotfix/0.8.0.1' into develop
Include the rails-3-develop branch in CI testing.
Merge branch 'develop' into rails-3-develop