Merge branch 'edge'
authorJim Morris <wolfmanjm@gmail.com>
Sat, 29 Nov 2014 04:45:49 +0000 (20:45 -0800)
committerJim Morris <wolfmanjm@gmail.com>
Sat, 29 Nov 2014 04:45:49 +0000 (20:45 -0800)

Trivial merge