Male cloth and dagger for testing purposes
Merge remote-tracking branch 'remotes/upstream/master'