Merge commit 'd293875' into mvebu/boards