edx/edx-platform — pull request #5672 by clytwynec (2014-10-21 20:38:12+00:00)
Title: Testeng/rebase upstream

@benpatterson @muhammad-ammar Please review.

Merging the Solano artifacts to edx master. Just need to confirm that everything you expect to be here is here.