Made a couple of utility static methods instance methods.
Merged branch '2.7.x' into 'master'.