Pull changes for #1475

Fixes #1475