Merge tag 'v1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 18:19:34 +0000 (14:19 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 18:19:34 +0000 (14:19 -0400)
version 1.0.4


Trivial merge