Let's try that again...
Merge branch 'master' into ascraeus