Merged Ian's things. Everything appears to be working.