Merge remote-tracking branch 'nolman/master' into fix-whitespace

Conflicts:
	spec/integration/ssl_ber_spec.rb
	spec/unit/ber/ber_spec.rb
	spec/unit/ber/core_ext/string_spec.rb
	spec/unit/ldap/dn_spec.rb
	spec/unit/ldap/entry_spec.rb
	spec/unit/ldap/filter_spec.rb
	test/test_entry.rb