Merge branch 'hotfix/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jan 2016 20:12:42 +0000 (15:12 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jan 2016 20:12:42 +0000 (15:12 -0500)

Trivial merge