Merge upstream changes

Merge changes from upstream PJAX-standalone. Also clean up comments