Pull fresh code from diefenbach's dev tree