0.94

sync up the 0.94 branch