Merge remote-tracking branch 'upstream/edge' into update/remove-onconfigreload-event
authorJim Morris <morris@wolfman.com>
Thu, 19 Jun 2014 09:50:18 +0000 (02:50 -0700)
committerJim Morris <morris@wolfman.com>
Thu, 19 Jun 2014 09:50:18 +0000 (02:50 -0700)

Trivial merge