Restore production environment
Merge pull request #600 from emmanuel-keller/master

Restore production environment