5.0-6231 vs. 5.0-6229 / sw-lin-mesa / chibi-robo-zfighting

5.0-6231 (8d16a40f) Diff 5.0-6229 (9a6644d0)
c10615a536f4cedb31cb2cfe1c25412adf6f7f08 Failure
6381f9585794ad6e9c77ea1c4b8b74e0dda2a474 Failure
6381f9585794ad6e9c77ea1c4b8b74e0dda2a474 Failure
ab9bb962ec47319c9669d2e07c355e00c8744e42 Failure