Core june 01

Merge with master please.