Add new code block syntax
Merge remote-tracking branch 'origin/rails23' into rails23