5.0-15518 vs. 5.0-15515 / sw-lin-mesa / chibi-robo-zfighting

5.0-15518 (dbaebdc5) Diff 5.0-15515 (6f4bbac5)
599254fc198b3be984809c77367b3a979eef7f73 Waiting for diff... 599254fc198b3be984809c77367b3a979eef7f73
39aa982937e2c5a98699ba207ea627299d955cc2 Waiting for diff... 73ef0ea3b4ec1c3a5f1a2220099ad101349d6f30
9b46b0f17cc7f37d5d1ba3fc05028d194bab2a83 Waiting for diff... 441e6ba91027f1dbc1c65afaa18f9d77e7b84416