Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 15:06:46 +0000 (11:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 15:06:46 +0000 (11:06 -0400)
Version 1.0.4


Trivial merge