Import recent changess from ruby-build v20140408
Merge branch 'ruby-build-20140408'