Merge branch 'hotfix/1.1.15' v1.1.15
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:18:57 +0000 (14:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:18:57 +0000 (14:18 -0400)

Trivial merge