Merge branch 'hotfix/1.0.1' v1.0.1
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 21:17:01 +0000 (16:17 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 21:17:01 +0000 (16:17 -0500)

Trivial merge