sync to ksuwdc master

DO NOT ACCEPT.  Was trying to pull from master to update and did not set base correctly.