Unity 4.5 - trunk changes

Merge of trunk changes into 4.5 branch.