Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 19:03:02 +0000 (14:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 19:03:02 +0000 (14:03 -0500)

Trivial merge