KG6JEI COMMENT: Origonaly this was commit 027d0e6b6c682cbf264912842fb2fb9ce92084c7 This got lost in the repo migration and has been chery-picked back into the repo. Change-Id: If02ade8efca0520b23abccdeceb9bf0fc4eb73d1