Plugin joli
change some gd
Merge remote-tracking branch 'origin/Greg'