bug fix merging master
bug fix merging master

dimitern/juju,perrito666/juju,mikemccracken/juju,mjs/juju,dooferlad/juju,gabriel-samfira/juju,bz2/juju,ericsnowcurrently/juju,dooferlad/juju,voidspace/juju,bogdanteleaga/juju,marcmolla/juju,frankban/juju,bac/juju,macgreagoir/juju,makyo/juju,mjs/juju,frankban/juju,reedobrien/juju,mjs/juju,ericsnowcurrently/juju,kat-co/juju,macgreagoir/juju,mjs/juju,reedobrien/juju,dimitern/juju,makyo/juju,fwereade/juju,davecheney/juju,bz2/juju,marcmolla/juju,perrito666/juju,axw/juju,bac/juju,marcmolla/juju,anastasiamac/juju,perrito666/juju,anastasiamac/juju,bz2/juju,alesstimec/juju,reedobrien/juju,dimitern/juju,bz2/juju,waigani/juju,bac/juju,anastasiamac/juju,makyo/juju,howbazaar/juju,fwereade/juju,alesstimec/juju,macgreagoir/juju,mikemccracken/juju,bac/juju,AdamIsrael/juju,perrito666/juju,ericsnowcurrently/juju,marcmolla/juju,anastasiamac/juju,macgreagoir/juju,kat-co/juju,bz2/juju,mikemccracken/juju,howbazaar/juju,mjs/juju,waigani/juju,axw/juju,makyo/juju,bac/juju,axw/juju,alesstimec/juju,mikemccracken/juju,AdamIsrael/juju,kat-co/juju,mjs/juju,alesstimec/juju,dooferlad/juju,bogdanteleaga/juju,waigani/juju,gabriel-samfira/juju,howbazaar/juju,marcmolla/juju,howbazaar/juju,kat-co/juju,frankban/juju,davecheney/juju,howbazaar/juju,frankban/juju,ericsnowcurrently/juju,dimitern/juju,anastasiamac/juju,reedobrien/juju,axw/juju,gabriel-samfira/juju,davecheney/juju,macgreagoir/juju,bogdanteleaga/juju,voidspace/juju,dooferlad/juju,waigani/juju,davecheney/juju,perrito666/juju,reedobrien/juju,frankban/juju,mikemccracken/juju,fwereade/juju,fwereade/juju,alesstimec/juju,dooferlad/juju,mjs/juju,axw/juju,ericsnowcurrently/juju,voidspace/juju,dimitern/juju,gabriel-samfira/juju,AdamIsrael/juju,gabriel-samfira/juju,AdamIsrael/juju,bogdanteleaga/juju,kat-co/juju,voidspace/juju