Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 19:09:50 +0000 (15:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 19:09:50 +0000 (15:09 -0400)
v1.0.4


Trivial merge