Matsa wrote (17 Jun 2013 19:43:57 GMT) : > Please review again and eventually merge.
Merged. In the future, please don't merge master into testing without
good reasons, though: it adds confusion to the mix, and makes your
changes harder to review and merge. Thanks :)