Merge branch 'master' into feature/gearman

Change-Id: I4f13e8ecfad5075ca40b66a989a5abe2c3be22fc