Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 18:34:02 +0000 (14:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 18:34:02 +0000 (14:34 -0400)
Version 1.0.4


Trivial merge