Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 25 May 2016 13:41:29 +0000 (09:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 25 May 2016 13:41:29 +0000 (09:41 -0400)

Trivial merge