Mr dave pull request

Merge with latest "unstable" tree of Mr-Dave