CiviCRM 4.4 compatible version.
Generic changes to make it compatible with CiviCRM 4.3 and 4.4.