Update to latest XBlock
Merge pull request #4952 from edx/pmitros/latest-xblock

Update to latest XBlock