Merge remote-tracking branch 'origin/stable'

Author: borsboom

stack.cabal

@@ -143,7 +143,7 @@ library
                    , base >= 4.7 && <5
                    , base16-bytestring
                    , base64-bytestring
-                   , bifunctors >= 4.2.1 && < 5.2
+                   , bifunctors >= 4.2.1 && < 5.3
                    , binary >= 0.7
                    , binary-tagged >= 0.1.1
                    , blaze-builder
@@ -261,7 +261,7 @@ executable stack
     cpp-options:     -DWINDOWS
   if !flag(disable-git-info)
     cpp-options:     -DUSE_GIT_INFO
-    build-depends:   gitrev >= 1.1
+    build-depends:   gitrev >= 1.1 && < 1.3
                    , optparse-simple >= 0.0.3
 
 test-suite stack-test