Merge branch 'hotfix/2.1.5' v2.1.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 17:17:57 +0000 (13:17 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 17:17:57 +0000 (13:17 -0400)

Trivial merge