Small doc update to mention sparse screen paths
Updated Freemarker to 2.3.21
Merge remote-tracking branch 'upstream/master'