Merge tag 'v1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 27 Jul 2016 20:05:55 +0000 (16:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 27 Jul 2016 20:05:55 +0000 (16:05 -0400)
version 1.0.4


Trivial merge