edx/configuration — pull request #1379 by hkim823 (2014-08-07 18:34:28+00:00)
Title: Master ... release

Merging new changes from release back into Master