Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 10 Jun 2016 20:56:39 +0000 (16:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 10 Jun 2016 20:56:39 +0000 (16:56 -0400)
version 1.0.4


Trivial merge