Merge branch 'hotfix/2.1.15' v2.1.15
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:57:00 +0000 (17:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:57:00 +0000 (17:57 -0400)

Trivial merge