Bugfix: Circlepuller is a dumbass and broke many mod actions, don't merge his commits without testing them
Merge remote-tracking branch 'upstream/master'