Merge branch 'master' into settings_auto_update
[situare] / doc /
drwxr-xr-x   ..
drwxr-xr-x - testing