Merge branch 'release/1.0.5' v1.0.5
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 13:16:40 +0000 (09:16 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 13:16:40 +0000 (09:16 -0400)

Trivial merge