Merge branch 'master' of github.com:NixOS/nixpkgs into amdapp-sdk
Merge branch 'master' of github.com:NixOS/nixpkgs into master
Merge branch 'firefox_libcanberra' into master