Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Feb 2017 21:47:32 +0000 (16:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Feb 2017 21:47:32 +0000 (16:47 -0500)
v1.0.12


Trivial merge