Merge remote-tracking branch 'origin/stable' into hotfix-0.10.2

image/Dockerfile

@@ -28,5 +28,5 @@ ADD service/slapd/daemon.sh /etc/service/slapd/run
 # Set OpenLDAP data and config directories in a data volume
 VOLUME ["/var/lib/ldap", "/etc/ldap/slapd.d"]
 
-# Expose ldap default port
-EXPOSE 389
+# Expose default ports for ldap and ldaps
+EXPOSE 389 636

image/service/slapd/daemon.sh

@@ -5,4 +5,4 @@
 # see https://github.com/docker/docker/issues/8231
 ulimit -n 1024
 
-exec /usr/sbin/slapd -h "ldap:/// ldapi:///" -u openldap -g openldap -d "$LDAP_LOG_LEVEL"
+exec /usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u openldap -g openldap -d "$LDAP_LOG_LEVEL"