Bump bundled torquebox version.
Merge branch 'master' into gsa