Merge tag '1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 30 Mar 2017 20:05:52 +0000 (16:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 30 Mar 2017 20:05:52 +0000 (16:05 -0400)
version 1.0.4


Trivial merge