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


Trivial merge