Merge branch 'master' into from_upstream

Conflicts:
      .gitmodules
      .travis.yml
      jimtcl
      src/jtag/core.c
      src/jtag/drivers/ftdi.c
      src/jtag/drivers/libjaylink
      src/jtag/drivers/mpsse.c
      src/jtag/drivers/stlink_usb.c
      src/rtos/hwthread.c
      src/target/riscv/riscv-013.c
      src/target/riscv/riscv.c
      tcl/board/sifive-hifive1-revb.cfg

Change-Id: I2d26ebeffb4c1374730d2e20e6e2a7710403657c

tools/checkpatch.sh

@@ -2,4 +2,4 @@
 #
 
 since=${1:-HEAD^}
-git format-patch -M --stdout $since | tools/scripts/checkpatch.pl - --no-tree
+git format-patch -M --stdout $since | tools/scripts/checkpatch.pl -

tools/release/helpers.sh

@@ -57,4 +57,3 @@ Release: ${PACKAGE_RELEASE}
    Type: ${RELEASE_TYPE}
 INFO
 }
-

tools/release/version.sh

@@ -146,4 +146,3 @@ do_version() {
 
 package_info_load
 do_version "$@"
-

tools/st7_dtc_as/st7_dtc_as.pl

@@ -706,4 +706,3 @@ if($opt{'b'}) {
 
 
 0;
-