5.0-17125 vs. 5.0-17123 / ogl-lin-mesa / chibi-robo-zfighting

5.0-17125 (ceae42b7) Diff 5.0-17123 (f59f1a2a)
62ca482c7d2f9a28a0b6c2d24def93c2f8bb5f88 Waiting for diff... c5f8fa4498a4a5e40beacfa1ce1fba173dbafb0d
4aba7bd57a86a516d0e82f0ba0f9636b034c910d Waiting for diff... da3083a57bd899e52af087671b8e8c7cea69cc13
cef7b9f0e7df6f10632629c29bff94828921485e Waiting for diff... 3b60b50cfd7154bfe3c0fc2dc36b8cf7800b8c90