5.0-18130 vs. 5.0-18128 / sw-lin-mesa / chibi-robo-zfighting

5.0-18130 (a20e41d3) Diff 5.0-18128 (c20bb01b)
be661692257741b05b4e20452caf6c23c34cce21 Waiting for diff... 620d1186d46cbcbab7636e0c5eac6e61ba5ea73a
c57a5f2482cfcbed2ecd96397a77e251c14be34b Waiting for diff... d88f4b53052e1450421eb00cea1a261502b9c694
53f8000b89a3cb6ca333708b7f2bdc2c4522f2cc Waiting for diff... b04a6fb2a5b44eb36dcb8f828fef5c7b952670c5