Merge remote-tracking branch 'mfleming/elflink' into elflink