Merge branch '2.3.0-wip' into 3.0.0-wip

diff --cc docs/components.html
Simple merge

diff --cc docs/css.html
Simple merge

diff --cc docs/customize.html
Simple merge

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

diff --cc docs/index.html
Simple merge

diff --cc docs/javascript.html
Simple merge

diff --cc docs/templates/layout.mustache
Simple merge