s/executer/executor
Merge branch 'executor' into develop

* executor:
  s/executer/executor