Merged eb/usrp-install r4723:4727 into trunk.