More updates for pelican 3.5
Merge branch 'master' into staging