Merge pull request #945 from cpennington/use-wrap-child

cms/djangoapps/contentstore/views/preview.py

common/djangoapps/tests.py

common/djangoapps/xmodule_modifiers.py

common/lib/xmodule/xmodule/conditional_module.py

common/lib/xmodule/xmodule/crowdsource_hinter.py

common/lib/xmodule/xmodule/modulestore/tests/factories.py

common/lib/xmodule/xmodule/randomize_module.py

common/lib/xmodule/xmodule/seq_module.py

common/lib/xmodule/xmodule/tests/rendering/__init__.py

common/lib/xmodule/xmodule/tests/rendering/core.py

...on/lib/xmodule/xmodule/tests/rendering/xmodule_asserts.py

common/lib/xmodule/xmodule/tests/test_conditional.py

common/lib/xmodule/xmodule/tests/test_crowdsource_hinter.py

common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py

common/lib/xmodule/xmodule/timelimit_module.py

common/lib/xmodule/xmodule/vertical_module.py

common/lib/xmodule/xmodule/x_module.py

lms/djangoapps/courseware/module_render.py

lms/djangoapps/courseware/tests/__init__.py

lms/djangoapps/courseware/tests/test_module_render.py