apply missing diffs that were lost in the merge conflict resolution
Merge pull request #367 from edx-solutions/cdodge/fix-release

apply missing diffs that were lost in the merge conflict resolution