Merge branch 'release/1.0.5' v1.0.5
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Dec 2015 21:53:12 +0000 (16:53 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Dec 2015 21:53:12 +0000 (16:53 -0500)

Trivial merge