Merge pull request #73 from wtlucy/MYFACES-4309

MYFACES-4309