merged over rbenv, preparing major merge