Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Feb 2016 18:28:12 +0000 (13:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Feb 2016 18:28:12 +0000 (13:28 -0500)

Trivial merge