Built against 1.7.2-R03
Merge remote-tracking branch 'origin/master'