merge squashed from destructuring/build-rvm.git