Add fabio.salvalai@gmail.com to .mailmap.
Merge remote-tracking branch 'origin/master'