Merge branch 'release/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 10 Jul 2017 16:02:25 +0000 (12:02 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 10 Jul 2017 16:02:25 +0000 (12:02 -0400)

Trivial merge