Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 14:36:50 +0000 (10:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 14:36:50 +0000 (10:36 -0400)
v1.0.4


Trivial merge