Merge tag 'v1.2.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Oct 2015 12:48:55 +0000 (08:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Oct 2015 12:48:55 +0000 (08:48 -0400)
v1.2.7


Trivial merge