Merge tag '1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 6 May 2016 12:22:39 +0000 (08:22 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 6 May 2016 12:22:39 +0000 (08:22 -0400)
version 1.0.4


Trivial merge