Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 14:57:02 +0000 (10:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 14:57:02 +0000 (10:57 -0400)

Trivial merge