spelling hierarchy correctly
comment typo java6 -> Java 7
Merge remote-tracking branch 'origin/master' into scheduler-simplification
Simplification.

Introduced task factory, removed scattered
related bits from 3 classes, now this happens only in
one class.