Merge pull request #561 from edx/rc/empanada

Rc/empanada
Merge branch 'release' of https://github.com/gdkar/configuration into release