PR: 204827 Submitted by: joris.dedieu@gmail.com Approved by: lukas.slebodnik@intrak.sk (maintainer) MFH: 2015Q4