Merged in the static-html branch