Merge branch 'hotfix/1.0.2'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:35:48 +0000 (14:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:35:48 +0000 (14:35 -0500)

Trivial merge