saltstack/salt — pull request #11466 by terminalmage (2014-03-23 20:52:20+00:00)
Title: Raise exception when pillar data is non-dict (2014.1 branch)

This is #11465, cherrypicked for 2014.1.