Merge gitk to pick up emergency build fix