Patch to support block:HighRes
Merge remote-tracking branch 'ryoshu/master'