Merge branch 'hotfix/2.1.26' v2.1.26
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 14:46:52 +0000 (10:46 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 14:46:52 +0000 (10:46 -0400)

Trivial merge