Merge branch 'master' into shake

build-constraints.yaml

@@ -379,6 +379,7 @@ packages:
         - pipes
         - pipes-parse
         - pipes-concurrency
+        - pipes-safe
 
     "Chris Allen <cma@bitemyapp.com>":
         - bloodhound
@@ -712,6 +713,10 @@ packages:
     "Timothy Jones git@zmthy.io @zmthy":
         - cabal-test-quickcheck
         - http-media
+        
+    "Greg V greg@unrelenting.technology @myfreeweb":
+        - gitson
+        - pcre-heavy
 
     "Stackage upper bounds":
 
@@ -758,6 +763,7 @@ packages:
         - rest-client < 0.5
         - rest-types < 1.13
         - rest-core < 0.35
+        - rest-gen < 0.17
 
 # Package flags are applied to individual packages, and override the values of
 # global-flags