Merge branch 'edx-west/release-20130617-candidate' of github.com:edx/edx-platform into edx-west-release-candidate-20130617