fix bug in autocommand's event handler
Merge branch 'master' into C#6ify