Merge branch 'release/1.2.7' v1.2.7
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Oct 2015 12:48:45 +0000 (08:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Oct 2015 12:48:45 +0000 (08:48 -0400)

Trivial merge