Fix bug #1706 (doc('html:document'))
Discard unused code including an unresolved import which can cause compiler problems
Merge remote-tracking branch 'origin/master'