Merge branch 'pu/2013.10-ldap' into 2013.10