Merge remote-tracking branch 'origin/filesystem_local_plugin_default_…

…dir_fix' into filesystem_local_plugin_default_dir_fix

# Conflicts:
#	plugins/filesystem/local/local.php