Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 20:37:34 +0000 (15:37 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 20:37:34 +0000 (15:37 -0500)
Version 1.0.4


Trivial merge