remove the __ from demos
Merge branch 'master' into analytic-font-global-dist