Converted main trunk to 1.1