Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jun 2016 18:09:13 +0000 (14:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jun 2016 18:09:13 +0000 (14:09 -0400)
v1.0.4


Trivial merge