Merge branch 'release/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:34:38 +0000 (14:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:34:38 +0000 (14:34 -0400)

Trivial merge