Correspond with rails master at "4fc493f"