manymals commit 1
Merge remote-tracking branch 'manymals/master'