Fixed spelling in comment
Merge branch 'master' into plugins