Merge branch '6.0' into 6.1

diff --cc docs/getting-started.md
Simple merge

diff --cc snippets/tutorial/tutorial-series/part-1/acptemplates/personList.tpl
Simple merge

diff --cc snippets/tutorial/tutorial-series/part-1/templates/personList.tpl
Simple merge

diff --cc snippets/tutorial/tutorial-series/part-3/acptemplates/personList.tpl
Simple merge

diff --cc snippets/tutorial/tutorial-series/part-3/templates/personList.tpl
Simple merge

diff --cc snippets/tutorial/tutorial-series/part-4/acptemplates/personList.tpl
Simple merge

diff --cc snippets/tutorial/tutorial-series/part-4/templates/personList.tpl
Simple merge

diff --cc snippets/tutorial/tutorial-series/part-5/acptemplates/personList.tpl
Simple merge

diff --cc snippets/tutorial/tutorial-series/part-5/templates/personList.tpl
Simple merge

diff --cc snippets/tutorial/tutorial-series/part-6/acptemplates/personList.tpl
Simple merge

diff --cc snippets/tutorial/tutorial-series/part-6/templates/personList.tpl
Simple merge