5.0-6988 vs. 5.0-6985 / sw-lin-mesa / mini-ninjas

5.0-6988 (ee955e37) Diff 5.0-6985 (aafa8a10)
Failure 58923111bdfb0dd2ffb9261138e36b6baf1d1bf9
Failure 2bc393c419de3873d959358e48dab928ddb9500e
Failure 2bc393c419de3873d959358e48dab928ddb9500e
Failure 7fb7287ba9266f8b04a99fb37b9b71ab347f5857