Merge in changes from master
Merge latest phonehome