Merge tag 'v1.0.37' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:38:42 +0000 (16:38 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:38:42 +0000 (16:38 -0400)
Fixed class redeclare error


Trivial merge