Merge branch 'hotfix/1.1.15'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:09:25 +0000 (16:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:09:25 +0000 (16:09 -0400)

Trivial merge