GIRAPH-692
GIRAPH-692
GIRAPH-740
GIRAPH-739
GIRAPH-734
GIRAPH-735
Merge remote-tracking branch 'origin/trunk' into findbugs