Merge branch 'release/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Dec 2017 18:43:27 +0000 (13:43 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Dec 2017 18:43:27 +0000 (13:43 -0500)

Trivial merge