Prep merge
Merge remote-tracking branch 'origin/xlrd' into xlrd

Synching local with remote updates.
pullxl work