Merge branch 'master' into zoom_button_drag
[situare] / scripts /
drwxr-xr-x   ..
-rwxr-xr-x 2706 master_test_script.sh