Fake merge of 'origin/develop'

After double-checking that all the commits from develop (d64c1a75..6ea12fc9) were already rebased into the master
branch history (fc84e576..e7e11b24), this fake merge simply makes sure that those old commits will not be lost, in case
anyone is pointing at them.