Merge branch 'release/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 20:11:16 +0000 (15:11 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 20:11:16 +0000 (15:11 -0500)

Trivial merge