PR merging

[Gianmarco De Francisci Morales]

Hi,

There was a problem merging the commits (SAMOA-43), and some part of the
history got deleted.
I restored it from my local master branch, it should be all fixed now.
However SAMOA-43 was not there, and should be merged again.

Cheers,
-- Gianmarco