Latest hotfix added on: Sat Jul 26 20:41:18 PDT 2014
Merge branch 'refs/heads/master' into 2.2.x-legacy