Bringing master up to date
Replacing placeholder content and minor style update