Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 18:07:26 +0000 (13:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 18:07:26 +0000 (13:07 -0500)
Version 1.0.4


Trivial merge