Catch some regex potential stack traces
Fix the merge conflicts in tests/unit/pydsl_test.py
Added doc for render time state execution and also fixed a bug with the feature.
Merge pull request #3662 from kjkuan/pydsl_merge_fix

Fix the merge conflicts in tests/unit/pydsl_test.py
Add @vlaci's idea to manage wmi
Import standard Salt file module functions
Add wmi winapi import
Add winapi context manager  _windows_platform_data
Shorten import line length
Add winapi context manager to win_network
remove unneeded import
bump version to 0.12.1
Merge pull request #3666 from UtahDave/winapi

Add context manager for WMI calls
Add network.hwaddr function

This function was part of salt in the past but was removed when the
output from network.interfaces was refactored a while back. This commit
adds it back.
Merge pull request #3670 from archtaku/network

Add network.hwaddr function
Minor tweaks to doc headings

Corrected odd grammar on the Modules doc page, and changed a similar
heading in the States docs to match the same wording.
Merge pull request #3671 from archtaku/docs

Minor tweaks to doc headings