Merge branch 'master' into dev
Authored by: Rick Copeland 2010-12-16
Parent(s): [4a7c4f][eb097a]
Child(ren): [de4a3c]