Merge branch 'hotfix/1.2.29' v1.2.29
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 18:28:19 +0000 (14:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 18:28:19 +0000 (14:28 -0400)

Trivial merge