Code

Merging in the changes from the 0.47 release branch. Also updating version numbers...