Merge remote-tracking branch 'upstream/master'

Conflicts:
  .gitignore
  Gemfile.lock
  Rakefile