Merge branch 'release/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Apr 2017 20:27:44 +0000 (16:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Apr 2017 20:27:44 +0000 (16:27 -0400)

Trivial merge