Merge pull request #1690 from karlp/pagekite