Merge tag 'v1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 19:10:12 +0000 (15:10 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 19:10:12 +0000 (15:10 -0400)
version 1.0.4


Trivial merge