Rel v6r13

Trying to update our fork. Please don't kill me.