Floor pickup fixed.
Merge remote-tracking branch 'origin/master'
Sync.
Merge remote-tracking branch 'origin/master'
Game specific upgrades.