Copied changes from trunk to 1.0.0