Merge branch 'master' into dev
Authored by: Wolf 2010-09-15
Parent(s): [3d6240][82f4ad]
Child(ren): [ee4b67]