not using \w for italics lookup since it matches _
Merge remote-tracking branch 'origin/master'