sync with github master

git-svn-id: http://source/svn/php_commons/branches/php_commons-4-github@2532 e588dd84-e1f6-4f18-b586-b92c208bf0ea
deprecate beautify

git-svn-id: http://source/svn/php_commons/branches/php_commons-4-github@2533 e588dd84-e1f6-4f18-b586-b92c208bf0ea
manual merge