exclude weird javax.servlet dependency
Merge branch 'master' into beta
beta2