Final commit for 3.40.46 "Bifrost"

Subversion-branch: /trunk
Subversion-revision: 2870