RVM upgrade.
Merge branch 'master' into 2-1-dev

Conflicts:
  .ruby-version