Ninjacommit
Merge remote-tracking branch 'origin/wip/ninja' into wip/mergetool

Conflicts:
	password-store.py