Import changes from ruby-build v20131030
Merge branch 'ruby-build-v20131030'