Merge remote-tracking branch 'origin/giraph'

Signed-off-by: Christian Krause <henshin.ck@gmail.com>