Changed blocks to use array syntax (now you can use almost anything as a block key).
Merge remote-tracking branch 'origin/master'