Merge branch 'master' into trac467

Conflicts:
	src/bin/auth/tests/auth_srv_unittest.cc