Update to work with Pelican 3.5
Merge branch 'pelican-3.5'