Merge tag 'V1.1.29' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 11 Feb 2016 16:32:00 +0000 (11:32 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 11 Feb 2016 16:32:00 +0000 (11:32 -0500)
v1.1.29


Trivial merge