Remove unused code because of the previous commit
Merge branch 'master' into php53
Append PATH to .bash_profile
Merge branch 'master' into php53