Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 20:11:22 +0000 (15:11 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 20:11:22 +0000 (15:11 -0500)
v1.0.4


Trivial merge