Merge branch 'work'
Merge branch 'work'
Merge branch 'master' into rails23_lts