merge from rails master