Merge branch 'master' into ruby-1-8-7
Trying to lower Ruby dependency to 1.8.7