Updated to match master
Ported CamelPackRefillHandler
Merge remote-tracking branch 'origin/master' into thislooksfun
Merge remote-tracking branch 'origin/thislooksfun'