Latest hotfix added on: Mon Aug 11 16:12:44 PDT 2014
Merge branch 'refs/heads/master' into 2.2.x-legacy
Sync with stable 2.2.x
Sync with stable 2.2.x
Silence debugging.
Merge branch 'refs/heads/master' into 2.2.x-legacy