Merge remote-tracking branch 'upstream/edge' into development/test-framework
authorJim Morris <morris@wolfman.com>
Sun, 13 Sep 2015 23:29:43 +0000 (16:29 -0700)
committerJim Morris <morris@wolfman.com>
Sun, 13 Sep 2015 23:29:43 +0000 (16:29 -0700)

Trivial merge