Fix migration issue#289

bretwalker wants to merge 2 commits into

openplans:masteropenplans/openblock:masterfrom

bretwalker:masterbretwalker/openblock:masterCopy head branch name to clipboard