Merge branch 'master' into 7.x-1.x
Issue #1427350 by bkosborne: Ensure URL path to settings page is correct for D6.
Issue #1386118 by hiddentao: Implement more sure way of working out Drupal version.
Issue #1431374 by hiddentao: Fix func_get_args() not usable as a function argument.
Issue #1427430 by joostvdl: Fix array_merge error.
Issue #1233124 by hiddentao: Replace mb_substr with drupal_substr.
Issue #1159288 by pcambra, hiddentao: Fixes intermittent error messages.
by hiddentao: Updated documentation for new hooks.
Drupal is a registered trademark of Dries Buytaert.