Merge branch 'release/1.0.47' v1.0.47
authorLaury GvR <laury@gaslightmedia.com>
Wed, 8 Nov 2017 22:18:54 +0000 (17:18 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 8 Nov 2017 22:18:54 +0000 (17:18 -0500)

Trivial merge