Merge branch 'hotfix/2.1.6' v2.1.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 18:14:12 +0000 (14:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 18:14:12 +0000 (14:14 -0400)

Trivial merge