rebase branch: rebased on 20120820 (http://darcs.net/Ideas/RebaseStatus)