Reverting master to 0.9, updated for 64-bit error