Hacked out ID code for 1.7
Merge remote-tracking branch 'origin/1.7' into 1.7