Sync with SVN

Merged in latest changes & fixes from SVN
Fixed (?) merge