saltstack/salt — pull request #7834 by cachedout (2013-10-15 02:21:50+00:00)
Title: Fix #7695 and add self to AUTHORS

Please somebody take a peek to ensure this approach is right (i.e. log and return None) and then I'll close the user-reported bug if appropriate. Thanks!