Merge branch 'release/1.2.6' v1.2.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 20:40:06 +0000 (15:40 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 20:40:06 +0000 (15:40 -0500)

Trivial merge