Merge branch 'master' into dev
Authored by: Dave Brondsema 2011-11-01
Parent(s): [0602e3][3fe9d9]
Child(ren): [da0d23]