bug #4385 Grid edit on sorted columns fails

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge branch 'QA_4_2'