Merge branch 'release/2.10.0' v2.10.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 18 Jul 2017 19:33:49 +0000 (15:33 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 18 Jul 2017 19:33:49 +0000 (15:33 -0400)

Trivial merge