camel
Merge tag 'release/staging/2014-08-27.1' into production

STACK: staging
BRANCH: rc/hotfix/2014.1.1
DAY: 2014-08-27