Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 21:31:04 +0000 (17:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 21:31:04 +0000 (17:31 -0400)
v1.0.4


Trivial merge