Updated to work with org-html 8.2.5g