cherry pick
cherry pick
cherry pick
add min-height to body
Merge pull request #2 from markbain/master

cherry pick