Just keep fixing the fiddles and eventually they'll work...
Merge branch 'master' into gh-pages