Merge branch 'hotfix/1.2.12' v1.2.12
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 25 May 2017 19:13:26 +0000 (15:13 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 25 May 2017 19:13:26 +0000 (15:13 -0400)

Trivial merge