Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:01:33 +0000 (12:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:01:33 +0000 (12:01 -0400)
v1.0.4


Trivial merge