Cherry-picked changes from master, 43b009f..4020e23
Ditched some library includes
Cherry-picked changes from master, 4020e23..ff83d3b
Cherry-picked changes from master, ff83d3b..39bc797
Cherry-picked changes from master, 39bc797..7876cdd
Merge branch 'cherry-picking-from-master' into static-site