• Merge branch 'master' into unc-paths

    @wfraser
    wfraser committed May 24, 2017
    Loading status checks…
    c802928