Merged master into dev
Authored by: Rick Copeland 2010-12-14
Parent(s): [9bc4aa][b122d0]
Child(ren): [bde8d6]