Merge branch 'release/1.0.4' v1.0.4
authorIan Weller <ian@gaslightmedia.com>
Wed, 27 Jul 2016 20:05:29 +0000 (16:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 27 Jul 2016 20:05:29 +0000 (16:05 -0400)

Trivial merge