Merged in from NiosII repo