Merge pull request #26 from sebbASF/patch-1

MYFACES-4383