Merge branch 'hotfix/1.0.12' v1.0.12
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 30 Jul 2015 20:17:20 +0000 (16:17 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 30 Jul 2015 20:17:20 +0000 (16:17 -0400)

Trivial merge