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

Trivial merge