Merge branch 'hotfix/2.1.8' v2.1.8
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 20 Jun 2016 16:36:06 +0000 (12:36 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 20 Jun 2016 16:36:06 +0000 (12:36 -0400)

Trivial merge