master-with-examples [MERGE]: master

Merge branch 'master' into master-with-examples

README.md

@@ -61,7 +61,10 @@ Source code is provided on branch `vendor`.
                          just before next vendor snapshot  
 `vendor`:                vendor import branch (just code, no example data)   
 `vendor-with-examples`:  vendor import with data file examples              
-`master`:                will point to `vendor`                              
+`master`:                is a child of `vendor` (additionally contains local
+                         modifications and additions)
+`master-with-examples`:  is a child of `vendor-with-examples` (additionally
+                         contains local modifications and additions)
 `workbench`:             separate branch providing tools for vendor imports   
 
 ### merge hierarchy