don't bind sm to closures
Merge remote-tracking branch 'origin/master'