Sync with twister-html/pull/202

Sync with https://github.com/miguelfreitas/twister-html/pull/202