GIRAPH-514
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/giraph into trunk

Conflicts:
	CHANGELOG