5.0-18358 vs. 5.0-18265 / ogl-lin-mesa / chibi-robo-zfighting

5.0-18358 (f056cec8) Diff 5.0-18265 (283f2171)
89142dc2d4895d9222d12293e1fa35ef97e4ee82 Waiting for diff... 62ca482c7d2f9a28a0b6c2d24def93c2f8bb5f88
3ca25f16ab63a6aa93cd1cdad42f1fa73f42ae19 Waiting for diff... 4aba7bd57a86a516d0e82f0ba0f9636b034c910d
9feea1ee8799aa99c0c6c351a6a8fabd3d548bf0 Waiting for diff... cef7b9f0e7df6f10632629c29bff94828921485e