Merge branch 'hotfix/1.0.5' v1.0.5
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 4 Sep 2015 16:36:29 +0000 (12:36 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 4 Sep 2015 16:36:29 +0000 (12:36 -0400)

Trivial merge