saltstack/salt — pull request #13208 by cachedout (2014-06-03 20:17:43+00:00)
Title: A port of #13200 into develop

Thanks to @jhenry82 for the good work here. This just ensures his work is
present in the develop branch as well.