Fix build expiration.
Update versions to 1.8... oops
 Bump protocol to 1.8
Merge remote-tracking branch 'upstream/master'