Hotfix 2.9.1 - Remove use of Late Static Binding

Late Static Binding is a PHP 5.3 addition. We need to support back until PHP 5.2.4 as that's what WordPress supports.
Whitespace corrections
Merge branch 'develop'