sync
Merge remote-tracking branch 'origin/tal' into jeff
sync with jeff for changes