no more snarky
no more snarky, mereged with pid som

Merge remote-tracking branch 'origin/master'