Merge branch 'release/1.0.5' v1.0.5
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 2 Dec 2015 16:07:26 +0000 (11:07 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 2 Dec 2015 16:07:26 +0000 (11:07 -0500)

Trivial merge