Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:50:13 +0000 (17:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:50:13 +0000 (17:50 -0400)
Version 1.0.4


Trivial merge