Merge 'rails3' into 'master'