edx/edx-platform — pull request #4249 by muhhshoaib (2014-06-30 10:05:56+00:00)
Title: changes as suggested by @dianakhuang and @jbau

@chrisndodge Kindly review the changeset.

Thanks