editing
Merge branch 'master' into ruby19rails3