Patch from Alex for Production 15/08/2014.

Adding missing patch provided by Alex for 15/08/2014 production.