Merge tag 'v3.7.0' into cleanup
authorKyle Guinn <elyk03@gmail.com>
Fri, 20 Jan 2017 05:22:19 +0000 (23:22 -0600)
committerKyle Guinn <elyk03@gmail.com>
Fri, 20 Jan 2017 05:22:19 +0000 (23:22 -0600)

Trivial merge