Final Sync for friday
Merge remote-tracking branch 'origin/tal' into wes