better assertion failure message
Merge branch 'stable'