Merge branch 'master' into chrono

Conflicts:
	hpx/runtime/threads/detail/set_thread_state.hpp
	src/runtime/threads/executors/thread_pool_executors.cpp