Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:56:24 +0000 (14:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:56:24 +0000 (14:56 -0400)
v1.0.4


Trivial merge