Render markup in inline threads on expand/collapse

This was a bug in 3af90ef.
Merge pull request #3389 from edx/hotfix/2014-04-17a

Render markup in inline threads on expand/collapse
Merge pull request #3392 from edx/release

Release