Minor tweaks before merge.
Merge branch 'master' into character_loading
Character loading operational.