fix
follow upstream
Merge branch 'experimental/updates' into refs/top-bases/experimental/marc

* experimental/updates:
  follow upstream

Conflicts:
	pkgs/applications/networking/browsers/opera/my.nix
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
  fix
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  follow upstream
  fix