Merge branch 'release/1.0.4' v1.0.4
authorOve Klykken <ove@gaslightmedia.com>
Tue, 29 Jul 2014 16:27:29 +0000 (12:27 -0400)
committerOve Klykken <ove@gaslightmedia.com>
Tue, 29 Jul 2014 16:27:29 +0000 (12:27 -0400)

Trivial merge