commit that I forgot to merge from my devel version. PR: ports/110125 Submitted by: Simon Phoenix<phoenix.lists@gmail.com>