5.0-16926 vs. 5.0-16914 / sw-lin-mesa / chibi-robo-zfighting

5.0-16926 (f1d23ff9) Diff 5.0-16914 (2ef069e0)
620d1186d46cbcbab7636e0c5eac6e61ba5ea73a Waiting for diff... 6279be96effb641378715c8c9814794ee225283b
d88f4b53052e1450421eb00cea1a261502b9c694 Waiting for diff... d77dd0d801950d2cb1ef5523ee9b72e46ad6417e
b04a6fb2a5b44eb36dcb8f828fef5c7b952670c5 Waiting for diff... e55fb9d5f9b733844f16802e9ef4d1e71d9e0513