Pub priv merge

Again... Updates to bootloader, Freescale targets and much more.