GIRAPH-884
Merge remote-tracking branch 'upstream/trunk' into GIRAPH-OOC