Merge branch 'release/1.2.8' v1.2.8
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 13:17:27 +0000 (09:17 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 13:17:27 +0000 (09:17 -0400)

Trivial merge