Copying PR #338 into the 1.x-master branch
Copying PR #350 into the 1.x-master branch
Copying PR #351 into the 1.x-master branch
Copying PR #353 into the 1.x-master branch
v1.3.4