Merge changes from master into FlashMaestro

FlashMaestro authored
revision 24fc31e388cd41e1cb283799758093aebee75dc1