workaround for ProgrammingError import
Merge remote-tracking branch 'origin/master' into toolbar_actions