rhaschke merge fixes from branch 'linking'