Update XBlock to latest version
Merge pull request #2983 from edx/will/update-xblock

Update XBlock to latest version