Merge branch 'hotfix/0.2.4' v0.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Dec 2015 21:35:20 +0000 (16:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Dec 2015 21:35:20 +0000 (16:35 -0500)

Trivial merge