Merge branch 'master' into dev
Authored by: Dave Brondsema 2011-11-01
Parent(s): [068ad2][590525]
Child(ren): [299f7f]