- Merged changesets 1399 up to and including 1415 into 1.2 branch

33 files changed