Use fully qualified name
Merge branch 'master' into deploy

* master:
  Use fully qualified name