Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:42:16 +0000 (14:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:42:16 +0000 (14:42 -0400)
v1.0.12


Trivial merge