[mastersummoner]

Not really related, but the way you chose to indicate a comment here immediately made me think you had merge conflicts.