Import changes from ruby-build 20140110.1