Latest hotfix added on: Sun Jul 27 20:31:22 PDT 2014
Merge branch 'refs/heads/master' into 2.2.x-legacy