Merge upstream

Refs #1