[HOTFIX] [AI-377] Analyse & Fix Outage 12/07/2013
Merge branch 'production' into staging