Merge branch 'hotfix/1.0.37' v1.0.37
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:38:22 +0000 (16:38 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:38:22 +0000 (16:38 -0400)

Trivial merge