Merge remote-tracking branches 'origin/combine', 'origin/minipet-notmounted', 'origin/warlock-fixes' and 'origin/symbiosis-fix'