Fix typo.
Merge.
Update components branch alias for dev-master.

Signed-off-by: crynobone <crynobone@gmail.com>
More public manager methods
Merge branch '4.1'