Merge branch 'master', remote-tracking branch 'origin' into daley
Make ServletContextHelper non static
Merge branch 'daley', remote-tracking branch 'origin'