fix for bug 1672
fix for previous commit (was using wrong destination path)
Merge branch 'editorfix'