Added back the only few lines lost in the merge from master
Added back the only few lines lost in the merge from master

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