Merge branch 'master' into dev
Authored by: Rick Copeland 2010-10-20
Parent(s): [014b4e][14febf]
Child(ren): [f7ced0]