Merge tag 'v1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 8 Jun 2017 18:12:10 +0000 (14:12 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 8 Jun 2017 18:12:10 +0000 (14:12 -0400)
version 1.0.4


Trivial merge