Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <ssutton@gmail.com>
Mon, 25 Sep 2017 10:00:15 +0000 (06:00 -0400)
committerSteve Sutton <ssutton@gmail.com>
Mon, 25 Sep 2017 10:00:15 +0000 (06:00 -0400)

Trivial merge