Merge tag 'v1.0.29' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 15:30:04 +0000 (11:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 15:30:04 +0000 (11:30 -0400)
v1.0.29


Trivial merge