Merge branch 'release/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Nov 2017 14:18:23 +0000 (09:18 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Nov 2017 14:18:23 +0000 (09:18 -0500)

Trivial merge