maybe 'script type=aap' wasn't such a good idea after all
Merge branch 'master' into gh-pages