Merge tag 'v1.0.4' into develop
authorlaury <laury@gaslightmedia.com>
Thu, 28 Sep 2017 13:44:15 +0000 (09:44 -0400)
committerlaury <laury@gaslightmedia.com>
Thu, 28 Sep 2017 13:44:15 +0000 (09:44 -0400)
v1.0.4


Trivial merge