Getting rid of multi line comment warning
Unifying executor semantics
Cosmetics
Merge branch 'master' into executors