first small fix to prevent canceling a locked submission
Merge remote-tracking branch 'origin/master'