Fix issue when merging develop branch
Fix issue when merging develop branch

anastasiamac/juju,mjs/juju,marcmolla/juju,mikemccracken/juju,AdamIsrael/juju,mikemccracken/juju,bac/juju,reedobrien/juju,ericsnowcurrently/juju,anastasiamac/juju,ericsnowcurrently/juju,frankban/juju,ericsnowcurrently/juju,marcmolla/juju,reedobrien/juju,ericsnowcurrently/juju,alesstimec/juju,mjs/juju,anastasiamac/juju,waigani/juju,mikemccracken/juju,anastasiamac/juju,bac/juju,waigani/juju,alesstimec/juju,mikemccracken/juju,bac/juju,mjs/juju,bac/juju,alesstimec/juju,reedobrien/juju,AdamIsrael/juju,waigani/juju,ericsnowcurrently/juju,waigani/juju,AdamIsrael/juju,frankban/juju,mjs/juju,frankban/juju,marcmolla/juju,frankban/juju,frankban/juju,reedobrien/juju,mjs/juju,marcmolla/juju,alesstimec/juju,bac/juju,AdamIsrael/juju,alesstimec/juju,mikemccracken/juju,marcmolla/juju,mjs/juju,anastasiamac/juju,reedobrien/juju,mjs/juju