Fix Felipe's name.
merge of 'be47140fbd41a5d0e2d58baf2fd90a44320ea6c6'
     and 'd1329583cce6b8afec406d1579dc4659384534d1'