PR: ports/55389 Submitted by: Mathieu Arnold <m@absolight.net>
PR: 32966 Submitted by: Sergey Skvortsov <skv@protey.ru>