Merge tag 'v1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 13 Dec 2016 17:39:38 +0000 (12:39 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 13 Dec 2016 17:39:38 +0000 (12:39 -0500)
version 1.0.4


Trivial merge