Merge branch 'hotfix/2.1.2' v2.1.2
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 15 Jun 2016 19:04:44 +0000 (15:04 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 15 Jun 2016 19:04:44 +0000 (15:04 -0400)

Trivial merge