Bugfix

git-svn-id: https://primefaces.googlecode.com/svn/primefaces/trunk@11670 5a70e874-a5cb-11dd-8af2-493fb0bb9f7c
Refactor

git-svn-id: https://primefaces.googlecode.com/svn/primefaces/trunk@11671 5a70e874-a5cb-11dd-8af2-493fb0bb9f7c
Merge branch 'master' into 5.0.x