Commit 2 from germanium
From Germanium
Merge branch 'master' into germanium