Merging in the changes from the 0.47 release branch. Also updating version numbers for 0.47 development. (bzr r8848)