Merge branch 'release/1.2.7' v1.2.7
authorLaury GvR <laury@gaslightmedia.com>
Fri, 15 Dec 2017 21:42:58 +0000 (16:42 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 15 Dec 2017 21:42:58 +0000 (16:42 -0500)

Trivial merge