Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 20:37:28 +0000 (15:37 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 20:37:28 +0000 (15:37 -0500)

Trivial merge