Merge branch 'release/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:44:59 +0000 (10:44 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:44:59 +0000 (10:44 -0500)

Trivial merge