Support rails master at 2014-06-29