Updated from SVN

See changelog.txt for details