Merge pull request #1214 from pearlchen/master

Got rid of HTML entities around <picture> and <img>