Get one branch going again

Remerge Master and Temp