rutie

8f0fb981 - Merge branch 'master' into prep-0.8.0-release