Updated template doc spacing
Merge branch 'upstream-master' into upstream-pages