fix up a few stragglers from bad merge 0418057
Merge remote-tracking branch 'origin/Luna'