Merge "Fixing the build." into gingerbread