PR: ports/161518 Approved by: Gavin McDonald<gavin@16degrees.com.au> (maintainer, original commit), gabor (mentor)