Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 21 Aug 2017 16:24:44 +0000 (12:24 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 21 Aug 2017 16:24:44 +0000 (12:24 -0400)
v1.0.12


Trivial merge