syntax fix for python 2.5
Merge branch 'feature/multiple_submit_buttons_in_grid' into develop