Merge branch 'release/1.0.5' v1.0.5
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 26 Aug 2016 16:13:39 +0000 (12:13 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 26 Aug 2016 16:13:39 +0000 (12:13 -0400)

Trivial merge