Small fixes due to use statement conflicts with another class in this namespace.

Signed-off-by: crynobone <crynobone@gmail.com>
Allow multiple chaining.

Signed-off-by: crynobone <crynobone@gmail.com>
Allow chaining to some method.

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