Editor updates
Merge remote-tracking branch 'origin/ChrisBanch'