4.0-2554 vs. 4.0-2547 / sw-lin-mesa / mini-ninjas

4.0-2554 (f2a1dd91) Diff 4.0-2547 (e4e44909)
Failure 584b3db138e1ca2ed9082016f8cfd5c2342fad9b
Failure 9c3bfe18f49dc75385da502792bb09756757f5eb