Updated to latest fixed base class.
Merge branch 'master' into Drupal6