JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,032 Commits 2 Branches 0 Tags 13 GiB
e6f81661aa
Commit Graph

6394 Commits

Author SHA1 Message Date
Peter Simons
99273a6716 Merge pull request #8047 from nckx/master 
Don't use "with licenses;" for single licences
 2015-05-28 22:14:53 +02:00
Gabriel Ebner
77c790fc0e Bump ibus, ibus-anthy, and ibus-qt to their latest versions. 2015-05-28 22:07:36 +02:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
Pascal Wittmann
3ae285976e parallel: update from 20150322 to 20150522 2015-05-28 19:02:41 +02:00
Rok Garbas
08b5686cd7 cygwin: tetex patch to make it build on cygwin 2015-05-28 14:15:47 +02:00
William A. Kennington III
85932bc5a9 krb5: 1.13.1 -> 1.13.2 2015-05-28 02:20:08 -07:00
Florian Friesdorf
12b781a945 cygwin: zip 2015-05-28 10:53:36 +02:00
Florian Friesdorf
7f7aca4e16 cygwin: asciidoc otherwise tries to install to //nix and fails on cygwin 
'//' on cygwin is the beginning of a SAMBA path
 2015-05-28 10:53:36 +02:00
Florian Friesdorf
2876b726bd cygwin: currently no libsigsegv for x86_64-cygwin 2015-05-28 10:53:36 +02:00
Marko Durkovic
af5484a630 cygwin: opensp 2015-05-28 10:53:36 +02:00
Florian Friesdorf
15952587a0 cygwin gnugrep: disable check due to multibyte-white-space 2015-05-28 10:53:36 +02:00
Florian Friesdorf
387ad260c0 cygwin: cpio fpending 2015-05-28 10:53:35 +02:00
Florian Friesdorf
3961eb8a6c cygwin: gnutar fpending 2015-05-28 10:53:35 +02:00
Florian Friesdorf
6756d7cdf8 cygwin: gzip fpending 2015-05-28 10:53:35 +02:00
Marko Durkovic
221b5a5be5 cygwin: findutils fpending and coreutils patch 2015-05-28 10:53:35 +02:00
Arseniy Seroka
98d160e1f0 Merge pull request #7966 from benley/cli53 
New package: cli53 (AWS Route53 admin CLI tool)
 2015-05-28 04:40:21 +03:00
Austin Seipp
6fbc62419b nixpkgs: afl 1.67b -> 1.80b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-05-27 16:36:26 -05:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix 
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
 2015-05-27 22:00:06 +02:00
Pascal Wittmann
9e0763dd8a Add lolcat, a rainbow version of cat 
Closes #3399
 2015-05-27 17:02:36 +02:00
Rob Vermaas
49b5acc3d9 Upgrade dhcpcd to 6.9.0. Version 6.8.1 caused issues on GCE, making the instances unavailable. 2015-05-27 11:43:14 +00:00
lethalman
af4d6468b2 Merge pull request #7959 from ikervagyok/darkice 
New Package: Darkice
 2015-05-27 10:51:59 +02:00
Arseniy Seroka
43690ae4ee Merge pull request #7987 from magnetophon/das_watchdog-master 
add das_watchdog: a realtime watchdog
 2015-05-27 11:47:15 +03:00
Tobias Geerinckx-Rice
dda255f938 jmtpfs: fix changed sha256 hash 
...by switching to fetchFromGitHub. Also clean up (some
dependencies are no longer needed).
 2015-05-27 02:56:39 +02:00
Benjamin Staffin
a9b9856c37 New package: cli53 (AWS Route53 admin CLI tool) 2015-05-26 10:29:27 -07:00
Lengyel Balázs
aa1ce46281 Inital commit for Darkice 2015-05-26 15:20:53 +02:00
Mateusz Kowalczyk
164a5ef32a Merge pull request #8006 from DamienCassou/update-offlineimap-6.5.7 
Update offlineimap 6.5.6 -> 6.5.7
 2015-05-26 14:16:06 +01:00
Bart Brouns
c3b7a8b053 add das_watchdog: a realtime watchdog 2015-05-26 15:13:59 +02:00
Damien Cassou
5f92dcce36 Update offlineimap 6.5.6 -> 6.5.7 2015-05-26 15:12:40 +02:00
Tobias Geerinckx-Rice
02e693e1b9 Remove w3c-css-validator 
Depends on missing tarballs. Broken since 2013.
 2015-05-26 11:46:41 +02:00
William A. Kennington III
1b82194892 dos2unix: 7.2.1 -> 7.2.2 2015-05-26 01:36:35 -07:00
William A. Kennington III
c2a32a689d nbd: 3.10 -> 3.11 2015-05-26 01:36:35 -07:00
William A. Kennington III
96178127c5 aria2: 1.18.10 -> 1.19.0 2015-05-26 01:36:35 -07:00
lethalman
b53f144c0d Merge pull request #7976 from mdorman/master-updates 
Fix SHA for pasystray.
 2015-05-26 10:35:38 +02:00
Herwig Hochleitner
3df28a32f5 debootstrap: update to current stable 
makedev 2.3.1-89 -> 2.3.1-93
debootstrap 1.0.66 -> 1.0.67
 2015-05-26 09:52:07 +02:00
Thomas Tuegel
255c0903a1 gnuplot: requires Qt 4 2015-05-25 21:04:01 -05:00
Michael Alan Dorman
1a4c952422 And now try fetchFromGitHub 2015-05-25 17:13:37 -04:00
Michael Alan Dorman
e81c6bd654 Use fetchzip to retrieve new pasystray. 2015-05-25 17:13:37 -04:00
Michael Alan Dorman
bc1b8cb33a Update pasystray to current version. 2015-05-25 17:13:37 -04:00
Michael Alan Dorman
fb655dce4c Fix SHA for pasystray. 
I presume there's something about how github creates the .zip files such
that they can change SHA.

Please note: this is a very outdated version of pasystray---I don't know
if that's intentional, but perhaps a better strategy would be to update
it wholesale.
 2015-05-25 17:13:37 -04:00
Edward Tjörnhammar
161fdec0f5 tidy-html5: added package, also provides libtidy5 2015-05-25 15:05:05 +02:00
Bob van der Linden
2f4dc083d5 added hwinfo 2015-05-25 14:17:46 +02:00
Tobias Geerinckx-Rice
c4a2f4f4b1 darkstat 3.0.718 -> 3.0.719 
- Implement tracking of remote ports: shows which ports the host
  is making outgoing connections to. Long time feature request.
- Bugfix: when the capture interface goes down, exit instead of
  busy-looping forever.
- Fix "clock error" due to machine reboot.
- SIGUSR1 now resets the time and bytes reported on the graphs
  page.
- Account for all IP protocols.
- Change the default ports_max to only twice the default
  ports_keep.
 2015-05-25 13:35:54 +02:00
Domen Kožar
bbc1df3092 Merge branch 'staging' 2015-05-25 11:33:05 +02:00
William A. Kennington III
580032914f dhcp: Add proper bind dependency 2015-05-24 15:05:25 -07:00
Domen Kožar
649ce300e3 Merge pull request #7587 from dezgeg/pr-refind 
refind: Fix build on i686
 2015-05-24 23:43:10 +02:00
Vladimír Čunát
f83d12a382 Merge 'master' into staging 2015-05-24 20:39:58 +02:00
Bjørn Forsman
b217d9a4dd fail2ban: fix broken download/hash 
The (dynamically generated) compressed archive has changed. Switch from
fetchurl to fetchzip to not get bitten by that again.
 2015-05-24 20:31:52 +02:00
William A. Kennington III
1efd5f0fdf ccid: 1.4.18 -> 1.4.19 2015-05-24 01:53:14 -07:00
William A. Kennington III
cdd93463c0 gawk: 4.1.2 -> 4.1.3 2015-05-24 00:19:35 -07:00
William A. Kennington III
171904e873 Merge pull request #7965 from benley/awscli-1.7.29 
awscli: update to 1.7.29
 2015-05-23 22:45:17 -07:00
William A. Kennington III
4d3c1caa7b Merge pull request #7963 from benley/riemann-c-client-1.7.0 
riemann-c-client: update to 1.7.0
 2015-05-23 22:44:37 -07:00
William A. Kennington III
384d8a79d0 Merge pull request #7717 from stephenmw/gcloud 
Add the google-cloud-sdk package
 2015-05-23 22:14:47 -07:00
Stephen Weinberg
da2aef3685 Add the google-cloud-sdk package 2015-05-24 06:20:45 +02:00
William A. Kennington III
3f4f90b58b e2fsprogs: 1.14.12 -> 1.14.13 2015-05-23 19:07:13 -07:00
Benjamin Staffin
50cb206cd5 awscli: update to 1.7.29 
Includes updates to bcdoc and botocore.
 2015-05-23 18:29:44 -07:00
Benjamin Staffin
f996306527 riemann-c-client: update to 1.7.0 2015-05-23 18:01:51 -07:00
Peter Simons
b7dd802f6c Merge pull request #7948 from magnetophon/fasd-fixup-master 
fasd: remove pandoc dep (==haskell), update revision
 2015-05-22 23:40:40 +02:00
William A. Kennington III
54963fb5b7 ceph: Now evaluate on darwin 2015-05-22 14:20:29 -07:00
William A. Kennington III
3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
William A. Kennington III
25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
Bart Brouns
177cbf7348 fasd: remove pandoc dep (==haskell), update revision 2015-05-22 21:50:17 +02:00
Arseniy Seroka
adfc77fcdf Merge pull request #7935 from doublec/tor 
Update tor to 0.2.6.8
 2015-05-22 14:48:04 +03:00
Tobias Geerinckx-Rice
87b27c9da5 stress-ng 0.04.02 -> 0.04.03 2015-05-22 10:39:28 +02:00
Tobias Geerinckx-Rice
5d5044b2ec Use mirror:// URIs for ftp.debian.org 
Provide a more robust experience for users with horrible network
hardware (me).
 2015-05-22 10:39:27 +02:00
Damien Cassou
188a067d8e Merge pull request #7929 from DamienCassou/update-networkmanager-1.0.2 
networkmanager 1.0.0 -> 1.0.2
 2015-05-22 10:19:48 +02:00
Damien Cassou
3a50708958 network-manager 1.0.0 -> 1.0.2 2015-05-22 10:17:01 +02:00
Chris Double
276bd7f16e Update tor to 0.2.6.8 2015-05-22 11:20:10 +12:00
Pascal Wittmann
f3867899ee tightvnc: replace occurences to /usr/bin/ssh 
closes #3669
 2015-05-21 18:53:45 +02:00
Pascal Wittmann
691b98fc28 tightvnc: refactoring 2015-05-21 18:53:45 +02:00
Michael Raskin
9ce93b6c29 Update TigerVNC to Git version; needed for GNU TLS compatibility 2015-05-21 19:48:25 +03:00
William A. Kennington III
19c259161b qemu: 2.2.2 -> 2.3.0 2015-05-20 18:30:22 -07:00
William A. Kennington III
737d77db75 btrfsprogs: 4.0 -> 4.0.1 2015-05-20 18:30:22 -07:00
Pascal Wittmann
c2dd7622c5 Merge pull request #7914 from pjones/pkg/mpdris2 
New package: mpDris2, MPRIS 2 support for mpd
 2015-05-20 23:45:35 +02:00
Peter Jones
05a6c34e04 New package: mpDris2, MPRIS 2 support for mpd 2015-05-20 15:37:25 -06:00
Nikolay Amiantov
dbcfd854c8 Merge pull request #7104 from gebner/mozc 
Add mozc, a Japanese input method from Google.
 2015-05-20 22:20:32 +03:00
Pascal Wittmann
2043857a73 youtube-dl: update from 2015-05-15 to 2015-05-20 2015-05-20 21:14:45 +02:00
Gabriel Ebner
64ecc21b9a Add mozc and its dependency zinnia. 2015-05-20 20:25:23 +02:00
Thomas Tuegel
49fa221c62 Update libbluedevil to 2.1 
The bluedevil build has been failing since it was updated to
2.1.1. Bluedevil and libbluedevil must be kept at the same major version!
 2015-05-20 07:25:13 -05:00
Luca Bruno
404608478d networkmanagerapplet: fix VPN plugins path. Closes #7908 2015-05-20 11:57:42 +00:00
William A. Kennington III
0bc84ecccd gummiboot: 45 -> 48 2015-05-20 00:27:03 -07:00
William A. Kennington III
ef7c804a6f openresolv: 3.5.7 -> 3.7.0 2015-05-20 00:03:48 -07:00
Mateusz Kowalczyk
5c8ea1958d youtube-dl: update to 2015.05.15 2015-05-20 06:58:09 +01:00
William A. Kennington III
35da884667 ceph: Support newer versions 2015-05-19 22:56:47 -07:00
Daniel Pfile
7c9d5eeee5 Upgrade Ansible to 1.9.1 2015-05-19 16:27:25 -05:00
Pascal Wittmann
65f1e8e048 ploticus: update from 2.41 to 2.42 2015-05-19 22:06:32 +02:00
Arseniy Seroka
b28d29ba0b fix missing argument 2015-05-19 21:09:34 +03:00
Pascal Wittmann
7761b0454d rddtool: update from 1.4.9 to 1.5.3 2015-05-19 20:08:15 +02:00
Luca Bruno
9adde87fea More usage of gnome3.defaultIconTheme 2015-05-19 14:44:27 +02:00
Chris Double
609002cc94 Update tor-browser to 4.5.1 2015-05-19 14:52:52 +12:00
Chris Double
49d9476608 Update to tor 0.2.6.7 2015-05-19 14:19:15 +12:00
Patrick Mahoney
02e46cacc6 keychain: fixup shebang, use upstream builder, install manpage 
fixup shebang - build was not running fixupPhase, and shebang was pointing to
/bin/sh. On a system where /bin/sh links to dash, this results in errors:

    /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: 59: /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: shopt: not found
    /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: 686: /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: Syntax error: "(" unexpected (expecting ")")

use upstream builder - the include Makefile uses perl to generate a manpage and
insert the same text into the keychain script for '--help' output, which was
otherwise missing:

    $ keychain --help

     * keychain 2.8.0 ~ http://www.funtoo.org

    [snip]

    INSERT_POD_OUTPUT_HERE

install manpage - self explanatory
 2015-05-18 15:26:06 -05:00
Nikolay Amiantov
ab7d2f7f39 network-manager-l2tp: add homepage 2015-05-18 17:21:08 +03:00
lethalman
efed756e67 Merge pull request #7849 from mschristiansen/mongo-tools-2 
MongoDB Tools and Go dependencies
 2015-05-18 10:52:49 +02:00
Mikkel Christiansen
734bc9f2e5 Add MongoDB tools and build dependencies. 2015-05-18 10:29:22 +02:00
Jascha Geerds
2b1802fec1 Merge pull request #7868 from eikek/master 
storebackup 3.4 -> 3.5
 2015-05-17 13:05:42 +02:00
Eike Kettner
699adbf6f9 storebackup 3.4 -> 3.5 2015-05-17 12:37:44 +02:00
Eric Seidel
c9d50c0128 Revert "man-db: dont use libpipeline on darwin, causes build failure" 
This reverts commit ef66f1536d.
 2015-05-16 17:27:25 -07:00
Domen Kožar
ea2c17571d miniupnp{c,d}: bump 2015-05-16 20:34:40 +02:00
Edward Tjörnhammar
3b4152f7e1 gtkvnc: add libgpgerror as dependency 2015-05-16 19:58:29 +02:00
Pascal Wittmann
496371321b atomicparsely: fixed build 2015-05-16 14:00:19 +02:00
William A. Kennington III
484a7be844 grub2: 2015-04-24 -> 2015-05-14 2015-05-15 18:38:15 -07:00
William A. Kennington III
da719f19a6 inetutils: 1.9.2 -> 1.9.3 2015-05-15 18:38:13 -07:00
William A. Kennington III
52587b9f81 tinc-pre: 2015-03-14 -> 2015-05-15 2015-05-15 18:38:12 -07:00
William A. Kennington III
3913d03890 ttylog: Add derivation 2015-05-15 18:38:12 -07:00
Vladimír Čunát
69a6848b57 rtmpdump: propagate build inputs according to *.pc 
This fixes ffmpeg-full build.
 2015-05-15 21:39:41 +02:00
Eric Seidel
ef66f1536d man-db: dont use libpipeline on darwin, causes build failure 2015-05-15 10:28:06 -07:00
Henry Till
8b580fb9d1 smartmontools: clean up meta, add darwin to meta.platforms 2015-05-15 12:41:33 -04:00
Spencer Whitt
2f6e9000e8 ent: clang fix 2015-05-15 11:58:21 -04:00
Spencer Whitt
e17dfe13e8 bandwidth: clang fix 2015-05-15 11:58:21 -04:00
Spencer Whitt
4c76dda4dd curl 7.15: Disable on Darwin 
Build is failing and this version of curl is not used for anything
useful on Darwin, so it's not worth fixing.
 2015-05-15 11:58:21 -04:00
Spencer Whitt
3f6b56812c bwm_ng: clang fix 2015-05-15 11:58:20 -04:00
Pascal Wittmann
9ac11fb2ef inadyn: fix & update from 1.99.10 to 1.99.13 2015-05-14 19:36:09 +02:00
Pascal Wittmann
bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Eric Seidel
67fe5d46d4 Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang 
Add isGNU and isClang attributes to cc-wrapper
 2015-05-14 10:09:07 -07:00
Pascal Wittmann
9c9c586534 Fixed several "package has no version" warnings 2015-05-14 17:19:41 +02:00
Oliver Charles
aef701babc opentsdb: Update 2.1.0 (official release) 2015-05-14 11:50:22 +01:00
Lluís Batlle i Rossell
53b6a4f063 Hack for btrfsProgs in ARM, due to a gcc bug. 
It fails to build otherwise:
/tmp/nix-build-btrfs-progs-4.0.drv-4/ccUNrySY.s:4014: Error: invalid operands (.text and *UND* sections) for `-'
 2015-05-13 21:24:48 +00:00
Charles Strahan
7021988dd1 Merge pull request #7818 from cstrahan/nmtui2 
networkmanager: enable nmtui, the curses interface
 2015-05-13 00:46:04 -04:00
Moritz Ulrich
24d5eb262d Pass: Add pwgen to wrapper. 2015-05-12 23:38:28 +02:00
Shea Levy
206d63edac curl: propagate inputs instead of patching pkgconfig 2015-05-12 13:07:58 -04:00
Shea Levy
f168973bfd Revert "curl: Improve .pc and .la patching" 
This breaks on darwin with:

> sed: -e: No such file or directory

This reverts commit 26c37ded73.
 2015-05-12 12:49:36 -04:00
Tobias Geerinckx-Rice
a989b629d9 lz4 128 -> 129 
- New: LZ4_compress_fast()
- Changed: New lz4 and lz4hc compression API. Previous function
  prototypes still supported.
- Changed: Sparse file support enabled by default
- New: LZ4 CLI improved performance compressing/decompressing multiple
  files
- Added: LZ4_compress_destSize()
- Fixed: GCC 4.9+ vector optimization
- Changed: Enums converted to LZ4F_ namespace convention
- Added: AppVeyor CI environment, for Visual tests
- Modified:Obsolete functions generate warnings
- Fixed : Bug #75 (unfinished stream)
- Updated: Documentation converted to MarkDown format
 2015-05-12 18:13:05 +02:00
Pascal Wittmann
e504a9301d bgs: update from 0.7 to 0.7.1 2015-05-12 17:24:50 +02:00
Tobias Geerinckx-Rice
5144f01d4f stress-ng 0.04.00 -> 0.04.02 2015-05-12 08:45:47 +02:00
Charles Strahan
1677b33162 networkmanager: enable nmtui, the curses interface 2015-05-11 20:54:17 -04:00
William A. Kennington III
bd69c51ddf trousers: Fix darwin build 2015-05-11 15:58:17 -07:00
William A. Kennington III
26c37ded73 curl: Improve .pc and .la patching 2015-05-11 15:12:38 -07:00
Eric Seidel
662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang} 
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
 2015-05-11 14:44:50 -07:00
Tobias Geerinckx-Rice
c7c10f28ad netsniff-ng -> 0.5.9 2015-05-11 23:12:09 +02:00
Pascal Wittmann
d9383746e6 bgs: update from 0.6 to 0.7 2015-05-11 18:16:12 +02:00
Wout Mertens
c7893e960d efibootmgr/var: upgrade 2015-05-11 14:25:17 +00:00
William A. Kennington III
1199d23a39 ceph: 0.94.1 -> 0.94.1.1 2015-05-11 01:29:17 -07:00
Michael Raskin
de02c8e880 Update Pipelight to use wine-staging 2015-05-10 13:46:32 +02:00
Michael Raskin
3dab0e11ee Update GlusterFS 2015-05-10 13:46:31 +02:00
Michael Raskin
b51dbb22dd Update badvpn 2015-05-10 13:46:31 +02:00
Michael Raskin
87eb733e5b Update IPMIutil 2015-05-10 13:46:31 +02:00
Michael Raskin
986a949a42 Update XDaliClock 2015-05-10 13:46:30 +02:00
Michael Raskin
3ed214e53c Update ZPAQ 2015-05-10 13:46:30 +02:00
William A. Kennington III
3da4a55ac4 screenfetch: 3.6.2 -> 2015-04-20 2015-05-10 13:46:29 +02:00
rushmorem
a7a0fcfbd2 Add s3ql package 
S3QL is a file system that stores all its data online using storage
services like Google Storage, Amazon S3, or OpenStack. S3QL effectively
provides a hard disk of dynamic, infinite capacity that can be accessed
from any computer with internet access running Linux, FreeBSD or OS-X.
 2015-05-10 13:46:01 +02:00
koral
839f3c3ab7 rmlint: 2.0.0 -> 2.1.0 2015-05-10 13:46:00 +02:00
Lluís Batlle i Rossell
282354a6cf Updating cjdns to latest master. 
It has important stability fixes.
 2015-05-09 20:22:58 +00:00
William A. Kennington III
c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
William A. Kennington III
c17b2144b4 tmux: 1.9a -> 2.0 2015-05-08 05:50:21 -07:00
Luca Bruno
eb98989cf0 Add libcrafter and tracebox 2015-05-08 13:20:27 +02:00
Domen Kožar
25408d4146 Merge pull request #7753 from Lassulus/my-15.05pre61665.4c01e6d 
s3fs: fix typo in name
 2015-05-08 10:42:07 +02:00
lassulus
d62204a1d2 s3fs: fix typo in name 2015-05-07 22:47:58 +02:00
Tobias Geerinckx-Rice
0db1bb5bda wget: verify cookie domains with libpsl 
Reduces vulnerability to "supercookie" attacks:
<http://comments.gmane.org/gmane.comp.web.wget.general/12820>
 2015-05-07 17:30:20 +02:00
Peter Simons
8ea440b59b Merge pull request #7600 from jraygauthier/jrg/add_diagrambuilder_stdalone_pkg 
Added standalone diagram-builder haskell package.
 2015-05-07 11:16:01 +02:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00