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