fix for 13.09 editor
Merge remote-tracking branch 'origin/editor' into 13.09
Merge branch '13.09'