bug fixes.
Merge remote-tracking branch 'origin/1.0-snapshot' into 1.0-snapshot