Properly type-hint Container.

Signed-off-by: crynobone <crynobone@gmail.com>
Update docblock.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'