Update to match the xblock version on master