Checkout
stsp
committed
on 11 Oct 16
Merge the resolve-incoming-add branch to trunk.