Merge branch 'master' into dev
Authored by: Rick Copeland 2011-07-19
Parent(s): [10ee66][5d77f6]
Child(ren): [c0088f]