Merge pull request #867 from laanwj/2012_02_hidetrayicononquit