merge from ASKBOT:master