Openblock 1.2 branch#290

Britoshi wants to merge 2 commits intomasteropenplans/openblock:masterfrom

openblock-1.2-branchopenplans/openblock:openblock-1.2-branchCopy head branch name to clipboard