Last minute update from trunk
Port fix from trunk
Set 1.3.4 version number
Create 1.3.4 release branch