fixing the last integration test (thanks to @raphaelbauer)
upgrading to the last ninja version
Merge remote-tracking branch 'origin/master'