Updating wheezy branch with GCE fixes