Merge ox-infojs.el into ox-html.el