merge updates from official pelican repository