Merge branch 'develop'
Merge branch 'develop'
Got rid of banal Bundler warning.
Run against Ruby 2.
Merge branch 'master' into develop