Merge branch 'master' of new.eeems.ca:Eeems/juju-php