Incorporate changes from rcarz master.