Merge branch 'release/1.2.34' v1.2.34
authorLaury GvR <laury@gaslightmedia.com>
Fri, 16 Dec 2016 17:15:33 +0000 (12:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 16 Dec 2016 17:15:33 +0000 (12:15 -0500)

Trivial merge