7098c3 Merge branch 'pi2/lufi-patch-1'

Merged and Committed by Luc Didry 4 years ago
    Merge branch 'pi2/lufi-patch-1'