[svn-upgrade] Integrating new upstream version, bti (017)