Merge branch 'master', remote-tracking branch 'origin' into hoos
added linux version of autofit