Response to CR
Merge branch 'master' of github.com:edx/XBlock into flowerhack/revised-docs