Fix screenshot test; there was some extra white space at the end of the page
Merge remote-tracking branch 'origin/master'