merging with wheezy
merge with wheezy and gce fix