Logical gates or opertaors for html-type
Merge remote-tracking branch 'upstream/master' into shortcodes