IP sampling
Merge branch 'master' into sauerbraten