Merge branch 'meleyal-patch-1' into 2.0.2-wip

diff --cc fluid.html
Simple merge

diff --cc hero.html
Simple merge

diff --cc starter-template.html
Simple merge