Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Feb 2015 16:39:28 +0000 (11:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Feb 2015 16:39:28 +0000 (11:39 -0500)
Version 1.0.4


Trivial merge