Bump ruby version to 2.1.5
Merge branch 'ruby2.1.5'