Synced with SVN, converted to UNIX line endings and spaces instead of tabs