Snapshot version 1.9 release 194
merge from trunk.