Merge branch 'hotfix/2.0.15' v2.0.15
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 18:57:56 +0000 (14:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 18:57:56 +0000 (14:57 -0400)

Trivial merge