upgrade to rails master