Merge in latest from the official repository