Merge master to dev
Authored by: Rick Copeland 2011-01-05
Parent(s): [b0d2b7][bd84f7]
Child(ren): [f8c2ff]