Upgraded Drupal to 7.28. #3495.
Merge branch 'master' into 3495-upgrade-drupal
Merge branch 'master' into 3495-upgrade-drupal
Merge branch 'master' into 3495-upgrade-drupal
Merge branch 'master' into 3495-upgrade-drupal
Merge branch 'master' into 3495-upgrade-drupal
Merge branch 'master' into 3495-upgrade-drupal
Merge branch 'master' into 3495-upgrade-drupal
Prevent half created terms from blocking the creation of additional terms. #4208
Merge branch 'master' into 3495-upgrade-drupal
Allow the updating of a classification imported from WoRMS. #4205
Prevent requests being sent to a timed out connection, by specifying a timeout value lower than that specified by the WoRMS service. #4199
Updated CHANGELOG.txt for 2.5.2.3
Merge branch 'branch-2.5.2.3'

Conflicts:
	CHANGELOG.txt
Merge branch 'master' into 3495-upgrade-drupal
Also aggregate the species_map view (#4210,#2461)
Merge branch 'master' into 3495-upgrade-drupal
Upgraded Drupal to 7.29. #3495
Ensure that responsive images are still responsive!
Merge branch 'master' into 3495-upgrade-drupal