Update to include the Rails contributions that got merged in.