Merge "Remove 'bot' check before trying the edit stash"