Merge branch 'hotfix/1.2.19' v1.2.19
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 18:50:13 +0000 (14:50 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 18:50:13 +0000 (14:50 -0400)

Trivial merge