Merge branch 'master' of github.com:aerospike/aerospike-common
Merge branch 'master' into john