Merge branches 'master' and 'master' of http://git.megacz.com/coq-hetmet