Fix for Issue #480 failbotage
Merge branch 'v0.10'