rollback changes
Merge branch 'master' into ruby-2.1.3