Reapply changes that got lost on merge 2013-10-13
Fixed ext-edit with F2 key