Dev freeze --> Master

Oh boy merge conflicts!