update dependencies
Merge remote-tracking branch 'upstream/master' into feature-jsp-testing