[050dev] Merge from trunk. Loads of odd tree conflicts.
[050dev] Merge from trunk. Loads of odd tree conflicts.

markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation