Pull in latest updates applied to beagleboard/master