Merge tag '1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 20 Apr 2016 19:52:53 +0000 (15:52 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 20 Apr 2016 19:52:53 +0000 (15:52 -0400)
version 1.0.4


Trivial merge