Latest hotfix added on: Tue Sep  9 20:20:16 PDT 2014
Merge branch 'refs/heads/2.3.x-dev'