Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 5 May 2016 18:51:33 +0000 (14:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 5 May 2016 18:51:33 +0000 (14:51 -0400)

Trivial merge