4.7 release merge
Past due by over 12 years
0% complete
Merge last few months of upstream branch changes - on "sync" branch to bring code up to 4.7 release (Sept 13, 2012)