Merge branch 'release/1.2.7' V1.2.7
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Sep 2016 17:37:39 +0000 (13:37 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Sep 2016 17:37:39 +0000 (13:37 -0400)

Trivial merge