tree 097ea3407e92869420f4c9773c834bd091eb53af
parent 058666014ab3a82d6edb123b7a27851697eee48b
parent 2844faaccce9cdde2f74392de1e139fead1b312f
author Fabio Utzig <utzig@apache.org> 1525820814 -0300
committer Fabio Utzig <utzig@apache.org> 1525820814 -0300

Merge from master

Signed-off-by: Fabio Utzig <utzig@apache.org>