Merge branch 'v3-0-stable' into v3-0-test

Resolved conflicts in source/VERSION.

diff --cc source/VERSION
index 1f38b98b6f683d551637c0c0f01437fa2ee79834,839dddaa9e5c48d750a7740eb528d6442150f7b7..4095e11eeea18165e8d13ee5e5b31abf72ecfdbe
--- 1/source/VERSION
--- 2/source/VERSION
+++ b/source/VERSION
@@@ -36,7 -36,7 +36,7 @@@ SAMBA_VERSION_RELEASE=2
  # e.g. SAMBA_VERSION_REVISION=a                        #
  #  ->  "2.2.8a"                                        #
  ########################################################
- SAMBA_VERSION_REVISION=b
 -SAMBA_VERSION_REVISION=
++SAMBA_VERSION_REVISION=a
  
  ########################################################
  # For 'pre' releases the version will be               #