#492, #493: Add marceloampuerop6 to the list of contributors
Merge remote-tracking branch 'origin/gh-pages' into gh-pages