Merge branch 'hotfix/1.0.40'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 13:27:16 +0000 (09:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 13:27:16 +0000 (09:27 -0400)

Trivial merge