Merge "Broken build. Missing ;" into gingerbread