Merge branch 'release/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:50:04 +0000 (17:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:50:04 +0000 (17:50 -0400)

Trivial merge