Fixed yohang/htmltools dependency
Merge remote-tracking branch 'origin/fix-htmltools-dependency' into 2.0.x