Removed blocks from __index of context (no need to access blocks keys without prefixing the blocks with blocks.
Merge remote-tracking branch 'origin/master'