Merge master to dev
Authored by: Rick Copeland 2011-01-05
Parent(s): [52d786][f5e590]
Child(ren): [c6b893]