Capability to add subroots
(cherry picked from commit ec9fe19)
Merge remote-tracking branch 'origin/2013.May' into 2013.May