Merge from 5.1.3

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