Merge branch 'hotfix/1.2.11' v1.2.11
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 25 May 2017 19:07:40 +0000 (15:07 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 25 May 2017 19:07:40 +0000 (15:07 -0400)

Trivial merge