Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 18:06:23 +0000 (14:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 18:06:23 +0000 (14:06 -0400)
v1.0.4


Trivial merge