edx/edx-platform — pull request #4825 by sarina (2014-08-14 12:53:05+00:00)
Title: Sarina/annotations fixes

@adampalay

Cherry-picks commits from #4796 and #4823 (once that one is good to go)