Merge branch 'master' into dev
Authored by: Dave Brondsema 2011-10-24
Parent(s): [36e00d][b2b474]
Child(ren): [cbea0c]