Merge tag 'v1.0.4' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Jun 2015 21:05:31 +0000 (17:05 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Jun 2015 21:05:31 +0000 (17:05 -0400)
Version 1.0.4


Trivial merge