Merge commit '954839fa2b502cff24cfa1f10bd6053d4062169e'

Conflicts:
	framework-subtree-from-macos/README - copie.md