Merge pull request #717 from tandraschko/master

MyFaces 2.3.7