Merge branch 'master' into DataExplorerIntegration

* master:
  removed additional but unnecessary const keywords
  Private t = y[i].
  Private i.
  Private j.
  Correct constness.
  Avoid unused argument warning.
  changed argument type from unsigned to bool
  introduced compiling options for Intel Compiler

Conflicts:
	scripts/cmake/CompilerSetup.cmake