Merge branch 'master' into dev
Authored by: Rick Copeland 2010-12-08
Parent(s): [41adad][c11e9c]
Child(ren): [1d84c0]