Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 16:52:23 +0000 (11:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 16:52:23 +0000 (11:52 -0500)
Version 1.0.4


Trivial merge