Merge tag 'v1.0.4' into develop
authorSteve Sutton <ssutton@gmail.com>
Mon, 25 Sep 2017 10:00:23 +0000 (06:00 -0400)
committerSteve Sutton <ssutton@gmail.com>
Mon, 25 Sep 2017 10:00:23 +0000 (06:00 -0400)
Version 1.0.4


Trivial merge