Fixed docker#477

maqdev wants to merge 8 commits into

jmathai:masterjmathai/elodie:masterfrom

maqdev:mastermaqdev/elodie:masterCopy head branch name to clipboard