Cosmetics
Merge branch 'master' of github.com:STEllAR-GROUP/hpx
Addressing warnings generated by PVS
Hand merging #1048: Fixing after 588 hang