Merge branch 'release/1.0.4' V1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 1 May 2015 19:00:47 +0000 (15:00 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 1 May 2015 19:00:47 +0000 (15:00 -0400)

Trivial merge