Merge branch 'hotfix/1.0.12' v1.0.12
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 4 Feb 2016 20:44:08 +0000 (15:44 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 4 Feb 2016 20:44:08 +0000 (15:44 -0500)

Trivial merge