Added stuff from elexis-vagrant