fixed typo in doc string
Merge remote-tracking branch 'salt/master'