just some slight commit message tweaks and LINUGUAS merge conflict resolution for !137 (closed)
LINUGUAS