Merge branch 'release/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Nov 2015 19:29:09 +0000 (14:29 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Nov 2015 19:29:09 +0000 (14:29 -0500)

Trivial merge