Merge branch 'hotfix/1.2.18' v1.2.18
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 14:51:14 +0000 (10:51 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 14:51:14 +0000 (10:51 -0400)

Trivial merge