PR: 199076 Submitted by: Christian Heckendorf <heckendorfc@gmail.com> Approved by: maintainer timeout (3 months) MFH: 2015Q3