Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 15:53:27 +0000 (11:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 15:53:27 +0000 (11:53 -0400)
v1.0.4


Trivial merge