Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 16:05:09 +0000 (12:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 16:05:09 +0000 (12:05 -0400)
v1.0.12


Trivial merge