saltstack/salt — pull request #15898 by jacksontj (2014-09-18 00:56:06+00:00)
Title: A few more fixes for stuff in the RC

More bugs I've found :)

Once I've got all these fixed I'll submit another pull req against 2014.7