update to ruby 2.1.4
Merge branch 'master' into stable