Merge in the latest version of XBlock.