! Make sure $modSettings['custom_avatar_dir'] is defined during the upgrade (fixes #1327)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1342 from Oldiesmann/release-2.1

! Make sure $modSettings['custom_avatar_dir'] is defined during the upgr...
Merge pull request #1343 from Arantor/release-2.1

Some bug fixes