Merge pull request #826 from laanwj/2012_02_fixminimizetotray