Merge remote-tracking branch 'upstream/edge' into fix/r-delta
authorJim Morris <morris@wolfman.com>
Mon, 1 Feb 2016 23:43:26 +0000 (15:43 -0800)
committerJim Morris <morris@wolfman.com>
Mon, 1 Feb 2016 23:43:26 +0000 (15:43 -0800)

Trivial merge