Merge branch 'release/1.2.34' v1.2.34
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Feb 2018 18:40:56 +0000 (13:40 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Feb 2018 18:40:56 +0000 (13:40 -0500)

Trivial merge