Merge branch 'hotfix/1.2.30' v1.2.30
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 27 Oct 2016 15:45:28 +0000 (11:45 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 27 Oct 2016 15:45:28 +0000 (11:45 -0400)

Trivial merge