Merge branch 'release/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Tue, 6 Mar 2018 21:54:36 +0000 (16:54 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 6 Mar 2018 21:54:36 +0000 (16:54 -0500)

Trivial merge