merge buildrob's changes for Panelolu/Viki