Merge remote-tracking branch 'upstream/develop' into sam_20131001
Merge remote-tracking branch 'upstream/develop' into sam_20131001
Merge remote-tracking branch 'upstream/develop' into sam_20131001
Fixed tags for progress events in state runs
Added preload parm to fire_master so can preload event meta data
such as jid.
Merge remote-tracking branch 'upstream/develop' into sam_20131001
Mimic the test case shown @ http://goo.gl/UI7uS8
Jinja needs to be "fed" Unicode data. Fixes #7576.

Additionally, what's returned from `render_jinja_tmpl` is also a Unicode string to that the `SLS_ENCODER` can properly encode them. Encoding UTF-8 data as UTF-8 data using the `SLS_ENCODER` does not, of course, work.
Fix race condition in salt-key

salt-key passes on the match glob to the applicable function within
salt.key.Key. However, if the glob includes a wildcard (or the argument
passed was -A/-D/-R, which executes the add/delete/reject on '*'), then
if there is any key activity between when the confirmation prompt
appears and when 'Y' is chosen, the wildcard could match one of the new
keys, resulting in unexpected actions being taken.

This commit changes the CLI usage of salt-key so that it passes a
dictionary of matching keys to the applicable function within
salt.key.Key. API backwards compatibility is preserved, because when
these pre-compiled dictionaries of keys are passed, they are passed in a
different argument name.
Merge pull request #7631 from s0undt3ch/issues/7576-utf8-chars

Jinja needs to be "fed" Unicode data. Fixes #7576
Merge pull request #7663 from evinrude/develop

Function arguments for smtp returner
Merge pull request #7665 from SmithSamuelM/sam_20131001

Fixed tags for progress events and preload
Merge pull request #7667 from terminalmage/issue7304

Fix race condition in salt-key
Add fileinput to list of Windows modules to freeze
Merge pull request #7670 from UtahDave/develop

Add fileinput to list of Windows modules to freeze
Add get_computer_desc
Merge pull request #7673 from UtahDave/develop

Add get_computer_desc
Add get_computer_name function
Merge pull request #7674 from UtahDave/develop

Add get_computer_name function
remove hostname arguments. not needed
Bump windows installer version number