Change search text
Merge branch 'master' into glassfish4