Merge branch 'release/1.0.5' v1.0.5
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Mar 2016 17:56:45 +0000 (13:56 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Mar 2016 17:56:45 +0000 (13:56 -0400)

Trivial merge