Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging

There was one conflict in the NixOS manual; I checked that it still
built after resolving it.

pkgs/applications/editors/kdevelop5/kdev-php.nix

@@ -2,14 +2,14 @@
 
 let
   pname = "kdev-php";
-  version = "5.3.1";
+  version = "5.3.2";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
-    sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl";
+    sha256 = "0yjn7y7al2xs8g0mrjvcym8gbjy4wmiv7lsljcrasjd7ymag1wgs";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];