Merge branch 'master' into pan_map
[situare] / debian / docs