Merge branch 'master' into AMATERASU-36-mesos