The previous "merge" commit was missing the master parent by accident. Thanks to @errge for noticing.