The newer --no-document option is preferred
Merge branch 'master' into rails-3-2