Merge branch 'master' into eucalyptus-devel