master merge

git-svn-id: svn://svn.caucho.com/home/svn/svnroot/resin/trunk@10252 9c94448d-38f1-0310-a231-d98308ff1ebf