Updated presets from Antti.
Merge remote-tracking branch 'origin/master' into userdb