Fix macro indentation
Merge pull request #578
Merge branch 'v1.4'

Conflicts:
	php_mongo.h