Merge tag 'v1.2.8' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 13:17:32 +0000 (09:17 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 13:17:32 +0000 (09:17 -0400)
v1.2.8


Trivial merge