Import recent changes from ruby-build 20140225