Fixed escaping '' in notes
Merge branch 'master' into BerryTube