5.0-15577 vs. 5.0-15571 / sw-lin-mesa / chibi-robo-zfighting

5.0-15577 (26e4e67d) Diff 5.0-15571 (1e212d62)
7730beb243157a71a4d570e7bee541c1af20c085 Waiting for diff... 599254fc198b3be984809c77367b3a979eef7f73
39aa982937e2c5a98699ba207ea627299d955cc2 Waiting for diff... 39aa982937e2c5a98699ba207ea627299d955cc2
9b46b0f17cc7f37d5d1ba3fc05028d194bab2a83 Waiting for diff... 9b46b0f17cc7f37d5d1ba3fc05028d194bab2a83