ack
erge branch 'master' into linux32