Merge branch 'release/1.0.40' v1.0.40
authorLaury GvR <laury@gaslightmedia.com>
Tue, 19 Sep 2017 15:35:55 +0000 (11:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 19 Sep 2017 15:35:55 +0000 (11:35 -0400)

Trivial merge