edx/edx-platform — pull request #1995 by nparlante (2013-12-18 20:16:32+00:00)
Title: Nick/jeff squash fixedup

This is the squashed-into-1 PR form of Jeff's capa and other features. This PR is placeholder for now.