Merge branch 'saveas-core'

Closes #336