diff --git a/.github/issue_template.md b/.github/issue_template.md
index 2abf86161..7a5504077 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,6 +1,6 @@
 <!--- Provide a general summary of the issue in the Title above -->
 <!--- If you have a question along the lines of "How do I do this Bash command in xonsh"
-please first look over the Bash to Xonsh translation guide: http://xon.sh/bash_to_xsh.html
+please first look over the Bash to Xonsh translation guide: https://xon.sh/bash_to_xsh.html
 If you don't find an answer there, please do open an issue! -->
 
 ## xonfig
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b178ca361..fb4cf13b3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,6 @@
 <!--- Thanks for opening a PR on xonsh! Please include a news entry with your PR
 to help keep our changelog up to date! There are instructions available here:
-http://xon.sh/devguide.html#changelog -->
+https://xon.sh/devguide.html#changelog -->
 
 <!--- If there is specific issue / feature request that this PR is addressing,
 please link to the corresponding issue by using the `#issuenumber` syntax.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 39c7d5677..dae87330f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,6 +21,13 @@ jobs:
 
   # Conda Environment
   # Create and activate a Conda environment.
+  - task: CondaEnvironment@1
+    inputs:
+      packageSpecs: 'python=$(python.version) conda=4.5.11 pygments prompt_toolkit ply pytest pytest-timeout numpy psutil matplotlib flake8 coverage pyflakes pytest-cov pytest-flake8 codecov'
+      installOptions: '-c conda-forge/label/cf201901'
+      updateConda: false
+    condition: eq(variables['python.version'], '3.5')
+    displayName: 'Conda Environment (conda-forge/label/cf201901)'
   - task: CondaEnvironment@1
     inputs:
       packageSpecs: 'python=$(python.version) pygments prompt_toolkit ply pytest pytest-timeout numpy psutil matplotlib flake8 coverage pyflakes pytest-cov pytest-flake8 codecov'
@@ -33,6 +40,7 @@ jobs:
       installOptions: '-c conda-forge'
       updateConda: false
     condition: ne(variables['python.version'], '3.5')
+    displayName: 'Conda Environment (conda-forge)'
   - script: |
       pip install .
       xonsh run-tests.xsh --timeout=10 --junitxml=junit/test-results.xml
diff --git a/docs/bash_to_xsh.rst b/docs/bash_to_xsh.rst
index b7b7b67da..0e2ba6836 100644
--- a/docs/bash_to_xsh.rst
+++ b/docs/bash_to_xsh.rst
@@ -4,6 +4,9 @@ As you have probably figured out by now, xonsh is not ``sh``-lang compliant.
 If your muscles have memorized all of the Bash prestidigitations, this page
 will help you put a finger on how to do the equivalent task in xonsh.
 
+For shell scripts, the recommended file extension is ``xsh``, and shebang
+line is ``#!/usr/bin/env xonsh``.
+
 .. list-table::
     :widths: 30 30 40
     :header-rows: 1
diff --git a/news/broke-sym.rst b/news/broke-sym.rst
new file mode 100644
index 000000000..cfc1aee57
--- /dev/null
+++ b/news/broke-sym.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* Made ``$PATH`` searching more robust to broken symlinks on Windows.
+
+**Security:**
+
+* <news item>
diff --git a/news/xontrib-direnv.rst b/news/xontrib-direnv.rst
new file mode 100644
index 000000000..981dcd0ff
--- /dev/null
+++ b/news/xontrib-direnv.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* A xontrib which adds support for `direnv <https://direnv.net/>`_
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>
diff --git a/xonsh/tools.py b/xonsh/tools.py
index 687b331d7..0347cc502 100644
--- a/xonsh/tools.py
+++ b/xonsh/tools.py
@@ -790,7 +790,11 @@ def _executables_in_windows(path):
                     yield fname
     else:
         for x in scandir(path):
-            if x.is_file():
+            try:
+                is_file = x.is_file()
+            except OSError:
+                continue
+            if is_file:
                 fname = x.name
             else:
                 continue
diff --git a/xonsh/xontribs.json b/xonsh/xontribs.json
index b54921cc6..b779e3d24 100644
--- a/xonsh/xontribs.json
+++ b/xonsh/xontribs.json
@@ -52,6 +52,11 @@
     "tools avoid the need for a full subprocess call. Additionally, these ",
     "tools are cross-platform."]
  },
+ {"name": "direnv",
+  "package": "xonsh-direnv",
+  "url": "https://github.com/74th/xonsh-direnv",
+  "description": ["Supports direnv."]
+ },
  {"name": "distributed",
   "package": "xonsh",
   "url": "http://xon.sh",
@@ -205,6 +210,13 @@
     "pip": "xpip install xonsh-apt-tabcomplete"
    }
   },
+  "xonsh-direnv": {
+   "license": "MIT",
+   "url": "https://github.com/74th/xonsh-direnv",
+   "install": {
+    "pip": "xpip install xonsh-direnv"
+   }
+  },
   "xonsh-docker-tabcomplete": {
    "license": "MIT",
    "url": "https://github.com/xsteadfastx/xonsh-docker-tabcomplete",