Latest hotfix added on: Sun Jul 27 07:41:26 PDT 2014
Merge branch 'refs/heads/master' into 2.2.x-legacy