Merge tag 'v1.2.34' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 16 Dec 2016 17:15:37 +0000 (12:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 16 Dec 2016 17:15:37 +0000 (12:15 -0500)
v1.2.34


Trivial merge