Merge branch 'master' into DIRSERVER-2223