Test on the latest Ruby 2.1
Merge branch 'master' into fix_recursive_diff