Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 19:25:05 +0000 (14:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 19:25:05 +0000 (14:25 -0500)
v1.0.4


Trivial merge