changes from main repo

this pull request *should* end up in my depot ... please ignore it if it doesn't :|