5.0-1487 vs. 5.0-1485 / ogl-lin-mesa / chibi-robo-zfighting

5.0-1487 (b15a40a8) Diff 5.0-1485 (989cdc09)
34e2280ee07a934ea90b918bd29837fa28abad68 Waiting for diff... 4b7a88ceb13372db0241c3b78fda3a1b1d7cd066
ad1e7dddc8a66754d8eefb4eed2bbfc2070f7978 Waiting for diff... fcf1ff4644035398641c334353e88d68012fdb16
ad1e7dddc8a66754d8eefb4eed2bbfc2070f7978 Waiting for diff... fcf1ff4644035398641c334353e88d68012fdb16
46fbda13f89032ce6b83fe5cff3b3f4889105be5 Waiting for diff... a712fdb1041e6348ec640491116090793f505aa4