Merge branch 'release/1.0.4'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 15:06:38 +0000 (11:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 15:06:38 +0000 (11:06 -0400)

Trivial merge