Merge branch 'master' of
https://github.com/arnabk/java-dogstatsd-client.git

Conflicts:
	maven_settings.xml
Merge branch 'master' of
https://github.com/arnabk/java-dogstatsd-client.git