Merge tag 'v1.2.29' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 18:28:25 +0000 (14:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 18:28:25 +0000 (14:28 -0400)
fixing syntax error


Trivial merge