Merge code from 0.9.5. 0.10 branch is now up-to-date. ---------------------------------------------------------------------- SVN revision: 43274