Merge r13116 from trunk to 2.5-stable

use rvm 2.0 and 2.1 instead of 2.0.0 and 2.1.0 at .travis.yml

See:
https://github.com/travis-ci/travis-ci/issues/2220

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13347 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13346 from trunk to 2.5-stable (#17581, #13932)

fix Drag & Drop does not work with Safari 5.1.

Contributed by fred bregar.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13348 e93f8b46-1217-0410-a6f0-8f06a7374b81