Merge tag '1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 20 Apr 2017 16:20:57 +0000 (12:20 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 20 Apr 2017 16:20:57 +0000 (12:20 -0400)
verison 1.0.4


Trivial merge