Merge branch 'release/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Nov 2015 21:13:22 +0000 (16:13 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Nov 2015 21:13:22 +0000 (16:13 -0500)

Trivial merge