Merge master

Merge ninja 1.5.3