Merge branch 'distance_scale'
[situare] / doc /
drwxr-xr-x   ..
drwxr-xr-x - testing