Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	src/SConstruct
	tests/flow.html
Debounced window resize in viewer
Soft voices in DocumentFormatter