Merge branch 'release/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 19:09:43 +0000 (15:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 19:09:43 +0000 (15:09 -0400)

Trivial merge