Revert "Revert "Merge branch 'master' of https://github.com/tapestry-team/tapestry""

This reverts commit 8960f62bc19869a9b9687d1df00ca68363d312b2.