Merge tag 'v1.2.9' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 15:39:29 +0000 (11:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 15:39:29 +0000 (11:39 -0400)
v1.2.9


Trivial merge