Merge branch 'hotfix/2.1.1' v2.1.1
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 15 Jun 2016 16:02:18 +0000 (12:02 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 15 Jun 2016 16:02:18 +0000 (12:02 -0400)

Trivial merge