Merge tag '14-08-04' into develop

Creating release 14-08-04 - new version of Drupal 6.32 and module updates.
Updating to Drupal 6.33
Merge branch 'release/14-08-19'