edx/edx-platform — pull request #840 by adampalay (2013-08-30 19:46:56+00:00)
Title: Hotfix/calc refactor

same as https://github.com/edx/edx-platform/pull/832