Fixed content flowing into header in shownotes
Merge remote-tracking branch 'upstream/master'