Merge tag 'v1.1.29' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 18:32:27 +0000 (14:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 18:32:27 +0000 (14:32 -0400)
v1.1.29


Trivial merge