Merge branch 'hotfix/1.0.1' v1.0.1
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 30 Nov 2015 21:28:59 +0000 (16:28 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 30 Nov 2015 21:28:59 +0000 (16:28 -0500)

Trivial merge