Pull in Rob and Victor's changes.
Pull in Rob and Victor's changes.

MaximilianMeister/crowbar,aplanas/crowbar,tserong/crowbar,SUSE-Cloud/crowbar,crowbar/crowbar,tserong/crowbar,rhafer/crowbar,rsalevsky/crowbar,dirkmueller/crowbar,rhafer/crowbar,dirkmueller/crowbar,aspiers/crowbar,rsalevsky/crowbar,vwallfahrer/crowbar,aplanas/crowbar,nkrinner/crowbar,nkrinner/crowbar,vwallfahrer/crowbar,toabctl/crowbar,rhafer/crowbar,SUSE-Cloud/crowbar,toabctl/crowbar,mmnelemane/crowbar,mmnelemane/crowbar,crowbar/crowbar,aspiers/crowbar,MaximilianMeister/crowbar