Fixed Maploading Bug.
Merge branch 'master' into inventory-base