Merge 'master' into issue-422-implement-by-refs

Author: Damian Rouson

.travis.yml

@@ -24,7 +24,7 @@ matrix:
     - os: osx
       env:
         - BUILD_TYPE="InstallScript"
-          OSX_PACKAGES="gcc@6 cmake"
+          OSX_PACKAGES="gcc@6"
           GCC=6
     - &ubuntu
       os: linux