fixed a bug that prevented edit event form pre-filling
Merge branch 'master' into afro