Commit v0.5 from SVN.