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