saltstack/salt — pull request #11664 by terminalmage (2014-03-31 14:58:27+00:00)
Title: Fix traceback when included environment not present

Fixes #11534.

@basepi only f1d7d6f needs to be cherrypicked, here.