Updated to V2.1.7 (google code repo clone from 20130128)