Fixed permissions inheritance (which I broke with my last fix) and a command message
Merge remote-tracking branch 'origin/master'