PR: ports/68243 Submitted by: Simon Barner <barner@in.tum.de>
PR: 33281 Submitted by: Philip Jenvey <pjenvey@turntables.org>