Ruby 2.1.2 for builds
Merge remote-tracking branch 'origin/master' into simple-form