$virtualDir= $this->config['virtual_dir'];
Merge branch 'master' into develop

* master:
  $virtualDir= $this->config['virtual_dir'];