Don't use '$this' in static methods
Merge branch 'wp35'