Merge branch 'master' into staging

Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix

pkgs/development/compilers/go/1.7.nix

@@ -100,6 +100,9 @@ stdenv.mkDerivation rec {
 
     sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
 
+    sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
+    sed -i 's/unrecognized/unknown/' src/cmd/go/build.go
+
     touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
 
     sed -i '1 a\exit 0' misc/cgo/errors/test.bash