Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:34:46 +0000 (14:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:34:46 +0000 (14:34 -0400)
v1.0.12


Trivial merge