Merge branch 'hotfix/1.2.11' v1.2.11
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 23 Jun 2016 18:18:56 +0000 (14:18 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 23 Jun 2016 18:18:56 +0000 (14:18 -0400)

Trivial merge