Merge branch 'release/2.1' into dev

.appveyor.yml

@@ -1,21 +1,19 @@
 init:
-  - git config --global core.autocrlf true
+- git config --global core.autocrlf true
 install:
-  - ps: Install-Product node 6.9.2 x64
+- ps: Install-Product node 6.9.2 x64
 branches:
   only:
-    - master
-    - release
-    - dev
-    - /^(.*\/)?ci-.*$/
-    - /^rel\/.*/
+  - dev
+  - /^release\/.*$/
+  - /^(.*\/)?ci-.*$/
 build_script:
-  - ps: .\run.ps1 default-build
+- ps: .\run.ps1 default-build
 clone_depth: 1
 environment:
   global:
     DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     DOTNET_CLI_TELEMETRY_OPTOUT: 1
-test: off
-deploy: off
+test: 'off'
+deploy: 'off'
 os: Visual Studio 2017

.travis.yml

@@ -12,8 +12,13 @@ addons:
     - zlib1g
 mono: none
 os:
-  - linux
-  - osx
+- linux
+- osx
 osx_image: xcode7.1
 script:
-  - ./build.sh
+- ./build.sh
+branches:
+  only:
+  - dev
+  - /^release\/.*$/
+  - /^(.*\/)?ci-.*$/