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