Merge tag 'v1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 6 Jul 2016 16:43:42 +0000 (12:43 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 6 Jul 2016 16:43:42 +0000 (12:43 -0400)
version 1.0.4


Trivial merge