More rubyish syntax
Merge branch 'feature/idiomatic-syntax' into rails-3-develop